24617732 nova.conf includes duplicate entries in several sections
authordavid.comay@oracle.com
Fri, 09 Sep 2016 16:31:02 -0700
changeset 6879 e4644601dca8
parent 6878 252671ed151a
child 6880 504ed056b9f8
24617732 nova.conf includes duplicate entries in several sections
components/openstack/nova/files/nova.conf
components/openstack/nova/patches/07-opts.patch
--- a/components/openstack/nova/files/nova.conf	Fri Sep 09 16:31:02 2016 -0700
+++ b/components/openstack/nova/files/nova.conf	Fri Sep 09 16:31:02 2016 -0700
@@ -3236,103 +3236,6 @@
 #db_max_retries = 20
 
 #
-# From oslo.db
-#
-
-# The file name to use with SQLite. (string value)
-# Deprecated group/name - [DEFAULT]/sqlite_db
-#sqlite_db = oslo.sqlite
-
-# If True, SQLite uses synchronous mode. (boolean value)
-# Deprecated group/name - [DEFAULT]/sqlite_synchronous
-#sqlite_synchronous = true
-
-# The back end to use for the database. (string value)
-# Deprecated group/name - [DEFAULT]/db_backend
-#backend = sqlalchemy
-
-# The SQLAlchemy connection string to use to connect to the database. (string
-# value)
-# Deprecated group/name - [DEFAULT]/sql_connection
-# Deprecated group/name - [DATABASE]/sql_connection
-# Deprecated group/name - [sql]/connection
-#connection = <None>
-
-# The SQLAlchemy connection string to use to connect to the slave database.
-# (string value)
-#slave_connection = <None>
-
-# The SQL mode to be used for MySQL sessions. This option, including the
-# default, overrides any server-set SQL mode. To use whatever SQL mode is set
-# by the server configuration, set this to no value. Example: mysql_sql_mode=
-# (string value)
-#mysql_sql_mode = TRADITIONAL
-
-# Timeout before idle SQL connections are reaped. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_idle_timeout
-# Deprecated group/name - [DATABASE]/sql_idle_timeout
-# Deprecated group/name - [sql]/idle_timeout
-#idle_timeout = 3600
-
-# Minimum number of SQL connections to keep open in a pool. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_min_pool_size
-# Deprecated group/name - [DATABASE]/sql_min_pool_size
-#min_pool_size = 1
-
-# Maximum number of SQL connections to keep open in a pool. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_pool_size
-# Deprecated group/name - [DATABASE]/sql_max_pool_size
-#max_pool_size = <None>
-
-# Maximum number of database connection retries during startup. Set to -1 to
-# specify an infinite retry count. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_retries
-# Deprecated group/name - [DATABASE]/sql_max_retries
-#max_retries = 10
-
-# Interval between retries of opening a SQL connection. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_retry_interval
-# Deprecated group/name - [DATABASE]/reconnect_interval
-#retry_interval = 10
-
-# If set, use this value for max_overflow with SQLAlchemy. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_overflow
-# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow
-#max_overflow = 50
-
-# Verbosity of SQL debugging information: 0=None, 100=Everything. (integer
-# value)
-# Deprecated group/name - [DEFAULT]/sql_connection_debug
-#connection_debug = 0
-
-# Add Python stack traces to SQL as comment strings. (boolean value)
-# Deprecated group/name - [DEFAULT]/sql_connection_trace
-#connection_trace = false
-
-# If set, use this value for pool_timeout with SQLAlchemy. (integer value)
-# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout
-#pool_timeout = <None>
-
-# Enable the experimental use of database reconnect on connection lost.
-# (boolean value)
-#use_db_reconnect = false
-
-# Seconds between retries of a database transaction. (integer value)
-#db_retry_interval = 1
-
-# If True, increases the interval between retries of a database operation up to
-# db_max_retry_interval. (boolean value)
-#db_inc_retry_interval = true
-
-# If db_inc_retry_interval is set, the maximum seconds between retries of a
-# database operation. (integer value)
-#db_max_retry_interval = 10
-
-# Maximum retries in case of connection error or deadlock error before error is
-# raised. Set to -1 to specify an infinite retry count. (integer value)
-#db_max_retries = 20
-
-#
 # From oslo.db.concurrency
 #
 
--- a/components/openstack/nova/patches/07-opts.patch	Fri Sep 09 16:31:02 2016 -0700
+++ b/components/openstack/nova/patches/07-opts.patch	Fri Sep 09 16:31:02 2016 -0700
@@ -3,17 +3,18 @@
 Solaris Zones hypervisor driver, as well as some missing common
 components.
 
---- nova-13.1.0/etc/nova/nova-config-generator.conf.~1~	2016-06-14 08:45:49.000000000 -0700
-+++ nova-13.1.0/etc/nova/nova-config-generator.conf	2016-07-25 23:42:03.124618180 -0700
[email protected]@ -21,3 +21,10 @@ namespace = oslo.db
+--- nova-13.1.0/etc/nova/nova-config-generator.conf.~1~	2016-06-14 08:45:49.000000000 +0000
++++ nova-13.1.0/etc/nova/nova-config-generator.conf	2016-09-08 18:14:37.539954980 +0000
[email protected]@ -17,7 +17,10 @@ namespace = oslo.policy
+ namespace = oslo.service.periodic_task
+ namespace = oslo.service.service
+ namespace = oslo.service.sslutils
+-namespace = oslo.db
++namespace = oslo.db.concurrency
  namespace = oslo.middleware
  namespace = oslo.concurrency
  namespace = keystonemiddleware.auth_token
 +namespace = castellan.config
-+namespace = oslo.db.concurrency
-+namespace = oslo.middleware.cors
-+namespace = oslo.middleware.sizelimit
-+namespace = oslo.middleware.ssl
 +namespace = oslo.reports
 +namespace = oslo.versionedobjects
 --- nova-13.1.0/nova/virt/opts.py.~1~	2016-06-14 08:45:49.000000000 -0700