Merge "Added possibility to manage use_db_reconnect option for Nova"
diff --git a/README.rst b/README.rst
index 932b96e..b111d84 100644
--- a/README.rst
+++ b/README.rst
@@ -1404,6 +1404,23 @@
until_refresh: 0
max_age: 0
+Set use_db_reconnect for Nova
+========
+
+.. code-block:: yaml
+
+ nova:
+ controller:
+ database:
+ use_db_reconnect: true
+
+.. code-block:: yaml
+
+ nova:
+ compute:
+ database:
+ use_db_reconnect: true
+
Upgrades
========
diff --git a/nova/files/ocata/nova-compute.conf.Debian b/nova/files/ocata/nova-compute.conf.Debian
index c32b3ca..6d6e28f 100644
--- a/nova/files/ocata/nova-compute.conf.Debian
+++ b/nova/files/ocata/nova-compute.conf.Debian
@@ -4568,6 +4568,7 @@
# Enable the experimental use of database reconnect on connection lost. (boolean
# value)
#use_db_reconnect=false
+use_db_reconnect = {{ compute.database.get('use_db_reconnect', false) }}
# Seconds between retries of a database transaction. (integer value)
#db_retry_interval=1
diff --git a/nova/files/ocata/nova-controller.conf.Debian b/nova/files/ocata/nova-controller.conf.Debian
index ba3b26b..5a1b5b1 100644
--- a/nova/files/ocata/nova-controller.conf.Debian
+++ b/nova/files/ocata/nova-controller.conf.Debian
@@ -4594,6 +4594,7 @@
# Enable the experimental use of database reconnect on connection lost. (boolean
# value)
#use_db_reconnect=false
+use_db_reconnect = {{ controller.database.get('use_db_reconnect', false) }}
# Seconds between retries of a database transaction. (integer value)
#db_retry_interval=1
diff --git a/nova/files/pike/nova-compute.conf.Debian b/nova/files/pike/nova-compute.conf.Debian
index 0874776..a6c4097 100644
--- a/nova/files/pike/nova-compute.conf.Debian
+++ b/nova/files/pike/nova-compute.conf.Debian
@@ -4623,6 +4623,7 @@
# Enable the experimental use of database reconnect on connection lost. (boolean
# value)
#use_db_reconnect=false
+use_db_reconnect = {{ compute.database.get('use_db_reconnect', false) }}
# Seconds between retries of a database transaction. (integer value)
#db_retry_interval=1
diff --git a/nova/files/pike/nova-controller.conf.Debian b/nova/files/pike/nova-controller.conf.Debian
index 60b747e..e5dbfb5 100644
--- a/nova/files/pike/nova-controller.conf.Debian
+++ b/nova/files/pike/nova-controller.conf.Debian
@@ -4647,6 +4647,7 @@
# Enable the experimental use of database reconnect on connection lost. (boolean
# value)
#use_db_reconnect=false
+use_db_reconnect = {{ controller.database.get('use_db_reconnect', false) }}
# Seconds between retries of a database transaction. (integer value)
#db_retry_interval=1