From 313c33049f8d0cb0e41cef52f35f5ce96ac3373a Mon Sep 17 00:00:00 2001
From: "Jay S. Bryant" <jsbryant@us.ibm.com>
Date: Wed, 3 Dec 2014 12:20:05 -0600
Subject: [PATCH] Bring cinder up-to-date with new oslo libraries

New versions of the oslo libraries have been released and
this has broken Cinder in the gate.  The first issue is
causing all unit tests to fail with the message:

"NoSuchOptError: no such option: fake_rabbit"

This was due to commit bcb3b23b8f6e7d01e38fdc031982558711bb7586
removing that option from oslo/messaging/_drivers/impl_rabbit.py .
We were trying to set that option in cinder/tests/conf_fixture.py .
I have removed that code.

Second, the update has made etc/cinder.conf.sample go out of date
again.  I am merging the changes to bring it back up to date.

This change also disables execution of check_uptodate.sh execution
from the gate.

Change-Id: Ie4e25a8cd36782007a8934cc4573632f5215c2b1
---
 cinder/tests/conf_fixture.py  |  1 -
 etc/cinder/cinder.conf.sample | 61 ++++++++++++++++++++++++++++++-----
 tox.ini                       |  1 -
 3 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/cinder/tests/conf_fixture.py b/cinder/tests/conf_fixture.py
index 00153de5c..4bb29c998 100644
--- a/cinder/tests/conf_fixture.py
+++ b/cinder/tests/conf_fixture.py
@@ -38,7 +38,6 @@ def set_defaults(conf):
     conf.set_default('volume_driver',
                      'cinder.tests.fake_driver.FakeISCSIDriver')
     conf.set_default('iscsi_helper', 'fake')
-    conf.set_default('fake_rabbit', True)
     conf.set_default('rpc_backend', 'cinder.openstack.common.rpc.impl_fake')
     conf.set_default('iscsi_num_targets', 8)
     conf.set_default('connection', 'sqlite://', group='database')
diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index e5027cd3b..e1ad694da 100644
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -4,11 +4,11 @@
 # Options defined in oslo.messaging
 #
 
-# Use durable queues in amqp. (boolean value)
+# Use durable queues in AMQP. (boolean value)
 # Deprecated group/name - [DEFAULT]/rabbit_durable_queues
 #amqp_durable_queues=false
 
-# Auto-delete queues in amqp. (boolean value)
+# Auto-delete queues in AMQP. (boolean value)
 #amqp_auto_delete=false
 
 # Size of RPC connection pool. (integer value)
@@ -56,8 +56,8 @@
 #qpid_topology_version=1
 
 # SSL version to use (valid only if SSL enabled). valid values
-# are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some
-# distributions. (string value)
+# are TLSv1 and SSLv23. SSLv2 and SSLv3 may be available on
+# some distributions. (string value)
 #kombu_ssl_version=
 
 # SSL key file (valid only if SSL enabled). (string value)
@@ -94,7 +94,7 @@
 # The RabbitMQ password. (string value)
 #rabbit_password=guest
 
-# the RabbitMQ login method (string value)
+# The RabbitMQ login method. (string value)
 #rabbit_login_method=AMQPLAIN
 
 # The RabbitMQ virtual host. (string value)
@@ -117,9 +117,6 @@
 # value)
 #rabbit_ha_queues=false
 
-# If passed, use a fake RabbitMQ provider. (boolean value)
-#fake_rabbit=false
-
 # ZeroMQ bind address. Should be a wildcard (*), an ethernet
 # interface, or IP. The "host" option should point or resolve
 # to this address. (string value)
@@ -2805,6 +2802,54 @@
 #ringfile=/etc/oslo/matchmaker_ring.json
 
 
+[oslo_messaging_amqp]
+
+#
+# Options defined in oslo.messaging
+#
+
+# address prefix used when sending to a specific server
+# (string value)
+#server_request_prefix=exclusive
+
+# address prefix used when broadcasting to all servers (string
+# value)
+#broadcast_prefix=broadcast
+
+# address prefix when sending to any server in group (string
+# value)
+#group_request_prefix=unicast
+
+# Name for the AMQP container (string value)
+#container_name=<None>
+
+# Timeout for inactive connections (in seconds) (integer
+# value)
+#idle_timeout=0
+
+# Debug: dump AMQP frames to stdout (boolean value)
+#trace=false
+
+# CA certificate PEM file for verifing server certificate
+# (string value)
+#ssl_ca_file=
+
+# Identifying certificate PEM file to present to clients
+# (string value)
+#ssl_cert_file=
+
+# Private key PEM file used to sign cert_file certificate
+# (string value)
+#ssl_key_file=
+
+# Password for decrypting ssl_key_file (if encrypted) (string
+# value)
+#ssl_key_password=<None>
+
+# Accept clients using either SSL or plain TCP (boolean value)
+#allow_insecure_clients=false
+
+
 [profiler]
 
 #
diff --git a/tox.ini b/tox.ini
index c9283eea9..1b30f0966 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,6 @@ deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
   python setup.py testr --slowest --testr-args='--concurrency 1 {posargs}'
-  {toxinidir}/tools/config/check_uptodate.sh
 whitelist_externals = bash
 
 [tox:jenkins]
-- 
2.45.2