Merge "[RabbitMQ] Removed deprecated ha_queue option from kilo, liberty and mitaka."
diff --git a/cinder/files/kilo/cinder.conf.controller.Debian b/cinder/files/kilo/cinder.conf.controller.Debian
index 27a32e4..11c2ea2 100644
--- a/cinder/files/kilo/cinder.conf.controller.Debian
+++ b/cinder/files/kilo/cinder.conf.controller.Debian
@@ -93,7 +93,6 @@
rabbit_userid = {{ controller.message_queue.user }}
rabbit_password = {{ controller.message_queue.password }}
rabbit_virtual_host = {{ controller.message_queue.virtual_host }}
-rabbit_ha_queues={{ controller.message_queue.ha_queues }}
kombu_reconnect_delay=5.0
{%- if controller.identity.get('version', 2) == 2 %}
diff --git a/cinder/files/kilo/cinder.conf.volume.Debian b/cinder/files/kilo/cinder.conf.volume.Debian
index 940fc96..1f48741 100644
--- a/cinder/files/kilo/cinder.conf.volume.Debian
+++ b/cinder/files/kilo/cinder.conf.volume.Debian
@@ -103,7 +103,6 @@
rabbit_userid = {{ volume.message_queue.user }}
rabbit_password = {{ volume.message_queue.password }}
rabbit_virtual_host = {{ volume.message_queue.virtual_host }}
-rabbit_ha_queues={{ volume.message_queue.ha_queues }}
kombu_reconnect_delay=5.0
{%- if volume.identity.get('version', 2) == 2 %}
diff --git a/cinder/files/liberty/cinder.conf.controller.Debian b/cinder/files/liberty/cinder.conf.controller.Debian
index 2c7b889..764a9a1 100644
--- a/cinder/files/liberty/cinder.conf.controller.Debian
+++ b/cinder/files/liberty/cinder.conf.controller.Debian
@@ -95,7 +95,6 @@
rabbit_userid = {{ controller.message_queue.user }}
rabbit_password = {{ controller.message_queue.password }}
rabbit_virtual_host = {{ controller.message_queue.virtual_host }}
-rabbit_ha_queues={{ controller.message_queue.ha_queues }}
kombu_reconnect_delay=5.0
{%- if controller.identity.get('version', 2) == 2 %}
diff --git a/cinder/files/liberty/cinder.conf.volume.Debian b/cinder/files/liberty/cinder.conf.volume.Debian
index 940fc96..1f48741 100644
--- a/cinder/files/liberty/cinder.conf.volume.Debian
+++ b/cinder/files/liberty/cinder.conf.volume.Debian
@@ -103,7 +103,6 @@
rabbit_userid = {{ volume.message_queue.user }}
rabbit_password = {{ volume.message_queue.password }}
rabbit_virtual_host = {{ volume.message_queue.virtual_host }}
-rabbit_ha_queues={{ volume.message_queue.ha_queues }}
kombu_reconnect_delay=5.0
{%- if volume.identity.get('version', 2) == 2 %}
diff --git a/cinder/files/mitaka/cinder.conf.controller.Debian b/cinder/files/mitaka/cinder.conf.controller.Debian
index ffc662b..04669f9 100644
--- a/cinder/files/mitaka/cinder.conf.controller.Debian
+++ b/cinder/files/mitaka/cinder.conf.controller.Debian
@@ -89,7 +89,6 @@
rabbit_userid = {{ controller.message_queue.user }}
rabbit_password = {{ controller.message_queue.password }}
rabbit_virtual_host = {{ controller.message_queue.virtual_host }}
-rabbit_ha_queues={{ controller.message_queue.ha_queues }}
kombu_reconnect_delay=5.0
[keystone_authtoken]
diff --git a/cinder/files/mitaka/cinder.conf.volume.Debian b/cinder/files/mitaka/cinder.conf.volume.Debian
index 1365f19..184a695 100644
--- a/cinder/files/mitaka/cinder.conf.volume.Debian
+++ b/cinder/files/mitaka/cinder.conf.volume.Debian
@@ -87,7 +87,6 @@
rabbit_userid = {{ volume.message_queue.user }}
rabbit_password = {{ volume.message_queue.password }}
rabbit_virtual_host = {{ volume.message_queue.virtual_host }}
-rabbit_ha_queues={{ volume.message_queue.ha_queues }}
kombu_reconnect_delay=5.0
[keystone_authtoken]
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index f52b8a6..5b5c9aa 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -34,4 +34,3 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
- ha_queues: false
diff --git a/metadata/service/volume/single.yml b/metadata/service/volume/single.yml
index 1705867..a452086 100644
--- a/metadata/service/volume/single.yml
+++ b/metadata/service/volume/single.yml
@@ -34,7 +34,6 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
- ha_queues: true
cache:
engine: memcached
members:
@@ -43,4 +42,4 @@
- host: ${_param:cluster_node02_address}
port: 11211
- host: ${_param:cluster_node03_address}
- port: 11211
\ No newline at end of file
+ port: 11211
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index d9d6a73..4c3b3bf 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -29,4 +29,3 @@
user: openstack
password: password
virtual_host: '/openstack'
- ha_queues: false
diff --git a/tests/pillar/volume_single.sls b/tests/pillar/volume_single.sls
index 2c69443..1b66ae2 100644
--- a/tests/pillar/volume_single.sls
+++ b/tests/pillar/volume_single.sls
@@ -28,4 +28,3 @@
user: openstack
password: password
virtual_host: '/openstack'
- ha_queues: true
\ No newline at end of file