24469506 db_string_length needs to be set to 255 and not 256
24469502 models.py needs the table_args corrected to use a dictionary value.
--- a/components/openstack/heat/patches/08-mysql_cluster_support.patch Thu Aug 18 12:47:33 2016 -0600
+++ b/components/openstack/heat/patches/08-mysql_cluster_support.patch Wed Aug 17 09:53:13 2016 -0600
@@ -301,7 +301,7 @@
class HeatBase(models.ModelBase, models.TimestampMixin):
"""Base class for Heat Models."""
- __table_args__ = {'mysql_engine': 'InnoDB'}
-+ __table_args__ = CONF.database.mysql_storage_engine
++ __table_args__ = {'mysql_engine': CONF.database.mysql_storage_engine}
def expire(self, session=None, attrs=None):
"""Expire this object ()."""
--- a/components/openstack/neutron/files/neutron.conf Thu Aug 18 12:47:33 2016 -0600
+++ b/components/openstack/neutron/files/neutron.conf Wed Aug 17 09:53:13 2016 -0600
@@ -740,7 +740,7 @@
# support different storage engines such as InnoDB, NDB, etc. By Default,
# this value will be set to InnoDB. For MySQL Cluster, set to NDBCLUSTER.
# Example: mysql_storage_engine=(string value)
-#mysql_storage_engine = InnoDB
+mysql_storage_engine = InnoDB
# Database reconnection retry times - in event connectivity is lost
# set to -1 implies an infinite retry count
--- a/components/openstack/neutron/patches/11-mysql_cluster_support.patch Thu Aug 18 12:47:33 2016 -0600
+++ b/components/openstack/neutron/patches/11-mysql_cluster_support.patch Wed Aug 17 09:53:13 2016 -0600
@@ -216,7 +216,7 @@
+if CONF.database.mysql_storage_engine == "NDBCLUSTER":
+ db_string_length = 128
+else:
-+ db_string_length = 256
++ db_string_length = 255
#neutron/db/models_v2.py
class HasTenant(object):
@@ -338,7 +338,7 @@
+if CONF.database.mysql_storage_engine == "NDBCLUSTER":
+ db_string_length = 128
+else:
-+ db_string_length = 256
++ db_string_length = 255
def upgrade():
bind = op.get_bind()