Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
24617715 'mysql_storage_engine' option's help message could be improved
authordavid.comay@oracle.com
Fri, 09 Sep 2016 16:31:02 -0700
changeset 6878 252671ed151a
parent 6877 3174bc3a7842
child 6879 e4644601dca8
24617715 'mysql_storage_engine' option's help message could be improved
components/openstack/cinder/files/cinder.conf file | annotate | diff | comparison | revisions
components/openstack/glance/files/glance-api.conf file | annotate | diff | comparison | revisions
components/openstack/glance/files/glance-glare.conf file | annotate | diff | comparison | revisions
components/openstack/glance/files/glance-manage.conf file | annotate | diff | comparison | revisions
components/openstack/glance/files/glance-registry.conf file | annotate | diff | comparison | revisions
components/openstack/glance/files/glance-scrubber.conf file | annotate | diff | comparison | revisions
components/openstack/heat/files/heat.conf file | annotate | diff | comparison | revisions
components/openstack/ironic/files/ironic.conf file | annotate | diff | comparison | revisions
components/openstack/keystone/files/keystone.conf file | annotate | diff | comparison | revisions
components/openstack/neutron/files/neutron.conf file | annotate | diff | comparison | revisions
components/openstack/nova/files/nova.conf file | annotate | diff | comparison | revisions
components/python/oslo.db/patches/mysql_cluster_support.patch file | annotate | diff | comparison | revisions 
--- a/components/openstack/cinder/files/cinder.conf	Fri Sep 09 15:23:48 2016 -0700
+++ b/components/openstack/cinder/files/cinder.conf	Fri Sep 09 16:31:02 2016 -0700
@@ -2886,9 +2886,9 @@
 #mysql_sql_mode = TRADITIONAL
 
 # This configures the MySQL storage engine. This allows for OpenStack to
-# 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)
+# support different storage engine 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
 
 # Timeout before idle SQL connections are reaped. (integer value)
--- a/components/openstack/glance/files/glance-api.conf	Fri Sep 09 15:23:48 2016 -0700
+++ b/components/openstack/glance/files/glance-api.conf	Fri Sep 09 16:31:02 2016 -0700
@@ -650,10 +650,10 @@
 # Example: mysql_sql_mode= (string value)
 #mysql_sql_mode = TRADITIONAL
 
-# This configures the MySQL storage engine. This allows for OpenStack to
-# 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)
+# This configures the MySQL storage engine. This allows for OpenStack
+# to support different storage engine 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
 
 # Timeout before idle SQL connections are reaped. (integer value)
--- a/components/openstack/glance/files/glance-glare.conf	Fri Sep 09 15:23:48 2016 -0700
+++ b/components/openstack/glance/files/glance-glare.conf	Fri Sep 09 16:31:02 2016 -0700
@@ -384,10 +384,10 @@
 # Example: mysql_sql_mode= (string value)
 #mysql_sql_mode = TRADITIONAL
 
-# This configures the MySQL storage engine. This allows for OpenStack to
-# 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)
+# This configures the MySQL storage engine. This allows for OpenStack
+# to support different storage engine 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
 
 # Timeout before idle SQL connections are reaped. (integer value)
--- a/components/openstack/glance/files/glance-manage.conf	Fri Sep 09 15:23:48 2016 -0700
+++ b/components/openstack/glance/files/glance-manage.conf	Fri Sep 09 16:31:02 2016 -0700
@@ -140,10 +140,10 @@
 # Example: mysql_sql_mode= (string value)
 #mysql_sql_mode = TRADITIONAL
 
-# This configures the MySQL storage engine. This allows for OpenStack to
-# 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)
+# This configures the MySQL storage engine. This allows for OpenStack
+# to support different storage engine 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
 
 # Timeout before idle SQL connections are reaped. (integer value)
--- a/components/openstack/glance/files/glance-registry.conf	Fri Sep 09 15:23:48 2016 -0700
+++ b/components/openstack/glance/files/glance-registry.conf	Fri Sep 09 16:31:02 2016 -0700
@@ -451,10 +451,10 @@
 # Example: mysql_sql_mode= (string value)
 #mysql_sql_mode = TRADITIONAL
 
-# This configures the MySQL storage engine. This allows for OpenStack to
-# 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)
+# This configures the MySQL storage engine. This allows for OpenStack
+# to support different storage engine 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
 
 # Timeout before idle SQL connections are reaped. (integer value)
--- a/components/openstack/glance/files/glance-scrubber.conf	Fri Sep 09 15:23:48 2016 -0700
+++ b/components/openstack/glance/files/glance-scrubber.conf	Fri Sep 09 16:31:02 2016 -0700
@@ -384,10 +384,10 @@
 # Example: mysql_sql_mode= (string value)
 #mysql_sql_mode = TRADITIONAL
 
-# This configures the MySQL storage engine. This allows for OpenStack to
-# 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)
+# This configures the MySQL storage engine. This allows for OpenStack
+# to support different storage engine 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
 
 # Timeout before idle SQL connections are reaped. (integer value)
--- a/components/openstack/heat/files/heat.conf	Fri Sep 09 15:23:48 2016 -0700
+++ b/components/openstack/heat/files/heat.conf	Fri Sep 09 16:31:02 2016 -0700
@@ -901,9 +901,9 @@
 #mysql_sql_mode = TRADITIONAL
 
 # This configures the MySQL storage engine. This allows for OpenStack to
-# 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)
+# support different storage engine 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
 
 # Timeout before idle SQL connections are reaped. (integer value)
--- a/components/openstack/ironic/files/ironic.conf	Fri Sep 09 15:23:48 2016 -0700
+++ b/components/openstack/ironic/files/ironic.conf	Fri Sep 09 16:31:02 2016 -0700
@@ -894,11 +894,12 @@
 # value)
 #mysql_sql_mode=TRADITIONAL
 
-# This configures the MySQL storage engine. This allows for OpenStack to
-# 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
+# This configures the MySQL storage engine. This allows for
+# OpenStack to support different storage engine 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
 
 # Timeout before idle SQL connections are reaped. (integer
 # value)
--- a/components/openstack/keystone/files/keystone.conf	Fri Sep 09 15:23:48 2016 -0700
+++ b/components/openstack/keystone/files/keystone.conf	Fri Sep 09 16:31:02 2016 -0700
@@ -559,9 +559,9 @@
 #mysql_sql_mode = TRADITIONAL
 
 # This configures the MySQL storage engine. This allows for OpenStack to
-# 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)
+# support different storage engine 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
 
 # Timeout before idle SQL connections are reaped. (integer value)
--- a/components/openstack/neutron/files/neutron.conf	Fri Sep 09 15:23:48 2016 -0700
+++ b/components/openstack/neutron/files/neutron.conf	Fri Sep 09 16:31:02 2016 -0700
@@ -709,9 +709,9 @@
 #mysql_sql_mode = TRADITIONAL
 
 # This configures the MySQL storage engine. This allows for OpenStack to
-# 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)
+# support different storage engine 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
 
 # Timeout before idle SQL connections are reaped. (integer value)
--- a/components/openstack/nova/files/nova.conf	Fri Sep 09 15:23:48 2016 -0700
+++ b/components/openstack/nova/files/nova.conf	Fri Sep 09 16:31:02 2016 -0700
@@ -2182,9 +2182,9 @@
 #mysql_sql_mode = TRADITIONAL
 
 # This configures the MySQL storage engine. This allows for OpenStack to
-# 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)
+# support different storage engine 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
 
 # Timeout before idle SQL connections are reaped. (integer value)
@@ -3166,9 +3166,9 @@
 #mysql_sql_mode = TRADITIONAL
 
 # This configures the MySQL storage engine. This allows for OpenStack to
-# 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)
+# support different storage engine 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
 
 # Timeout before idle SQL connections are reaped. (integer value)
--- a/components/python/oslo.db/patches/mysql_cluster_support.patch	Fri Sep 09 15:23:48 2016 -0700
+++ b/components/python/oslo.db/patches/mysql_cluster_support.patch	Fri Sep 09 16:31:02 2016 -0700
@@ -2,7 +2,8 @@
 
 24409419 Mitaka oslo.db should support MySQL Cluster
 
-This fixes the following aspects of Oslo.db:
+This fixes the following aspects of oslo.db:
+
 1. Implementation of an oslo.db configuration parameter to specify the MySQL
    storage engine (mysql_storage_engine).
 
@@ -10,9 +11,8 @@
 
 https://bugs.launchpad.net/oslo.db/+bug/1564110
 
-
---- oslo.db-4.7.0/oslo_db/options.py.orig	2016-08-04 14:14:42.609731178 -0700
-+++ oslo.db-4.7.0/oslo_db/options.py	2016-08-04 14:42:24.071847993 -0700
+--- oslo.db-4.7.0/oslo_db/options.py.~1~	2016-03-27 20:04:48.000000000 +0000
++++ oslo.db-4.7.0/oslo_db/options.py	2016-09-08 23:03:23.562323080 +0000
 @@ -48,6 +48,13 @@ database_opts = [
                      'server-set SQL mode. To use whatever SQL mode '
                      'is set by the server configuration, '
@@ -21,9 +21,9 @@
 +               default='InnoDB',
 +               help='This configures the MySQL storage engine. '
 +                    'This allows for OpenStack to support different storage '
-+                    'engine such as InnoDB, NDB, etc. For MySQL Cluster, '
-+                    'such as InnoDB, NDB, etc. For MySQL Cluster, set to '
-+                    'NDBCLUSTER. Example: mysql_storage_engine=NDBCLUSTER'),
++                    'engine such as InnoDB, NDB, etc. By default, '
++                    'this value will be set to InnoDB. For MySQL Cluster, '
++                    'set to NDBCLUSTER. Example: mysql_storage_engine='),
      cfg.IntOpt('idle_timeout',
                 default=3600,
                 deprecated_opts=[cfg.DeprecatedOpt('sql_idle_timeout',
upstream/oracle/userland-gate