commit 5142fbfc24e7f9cbf00bf0a3a38e4768064fffc5
author Jenkins <jenkins@review.openstack.org> Sat Apr 23 15:50:22 2016 +0000
committer Gerrit Code Review <review@openstack.org> Sat Apr 23 15:50:22 2016 +0000
tree 1854cf37758c3bf81080bb4d20d870ce880f3ffa
parent a82b8205776b54739e2973e19dff091d4965d645
parent 4405176427f83feaf452f8113223f42fc7dae508

Merge "Compatibility with Debian and Ubuntu 16.04"

metadata/service/control/cluster.yml

diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 0bc715e..3828de2 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -51,7 +51,6 @@
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
-        ha_queues: true
       glance:
         host: ${_param:cluster_vip_address}
         port: 9292

tests/pillar/control_cluster.sls

diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 018f222..5ee0ab2 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -40,7 +40,6 @@
       user: openstack
       password: password
       virtual_host: '/openstack'
-      ha_queues: true
     glance:
       host: 
       port: 9292