From: Jay S. Bryant <jsbryant@us.ibm.com>
Date: Mon, 17 Nov 2014 19:11:03 +0000 (-0600)
Subject: Update cinder.conf.sample to fix max db conn retries
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1697859eea4891101475b7846b7e31dcab60078c;p=openstack-build%2Fcinder-build.git

Update cinder.conf.sample to fix max db conn retries

Another external library change (oslo.db) has broken the gate
because cinder.conf.sample appears to be out of date.  The change
was just to a message string:

   Maximum number of database connection retries during
   startup. Set to -1 to specify an infinite retry count. (integer value)
   ->
   Maximum db connection retries during startup. Set to -1 to
   specify an infinite retry count. (integer value)

This patch updates cinder.conf.sample to get beyond this failure.  The
Cinder team will be talking about how to avoid these issues in the future.

Change-Id: Ia14954842d141b9bd208ce98c5a70a42b014ac45
(cherry picked from commit 969a27c56e8c69ba7420d98a0c123dce2ad16870)
---

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 3f1128c6d..359eeb847 100644
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -2399,8 +2399,9 @@
 # Deprecated group/name - [DATABASE]/sql_max_pool_size
 #max_pool_size=<None>
 
-# Maximum db connection retries during startup. Set to -1 to
-# specify an infinite retry count. (integer value)
+# 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