[RabbitMQ] Removed ha_queues from config file for kilo and liberty.

Change-Id: I31fb4788f0eeb422af05c001e76364adc91abee2
diff --git a/ceilometer/files/kilo/ceilometer-agent.conf.Debian b/ceilometer/files/kilo/ceilometer-agent.conf.Debian
index 4c52ea5..b4f818b 100644
--- a/ceilometer/files/kilo/ceilometer-agent.conf.Debian
+++ b/ceilometer/files/kilo/ceilometer-agent.conf.Debian
@@ -419,7 +419,6 @@
 # Deprecated group/name - [DEFAULT]/rabbit_virtual_host
 #rabbit_virtual_host = /
 rabbit_virtual_host = {{ agent.message_queue.virtual_host }}
-rabbit_ha_queues={{ agent.message_queue.ha_queues }}
 
 # How frequently to retry connecting with RabbitMQ. (integer value)
 #rabbit_retry_interval = 1
@@ -515,4 +514,4 @@
 prefix = {{ agent.publisher.graphite.get('prefix', 'ceilometer') }}.
 append_hostname = true
 
-{%- endif %}
\ No newline at end of file
+{%- endif %}
diff --git a/ceilometer/files/kilo/ceilometer-server.conf.Debian b/ceilometer/files/kilo/ceilometer-server.conf.Debian
index 787b1a4..085ef6b 100644
--- a/ceilometer/files/kilo/ceilometer-server.conf.Debian
+++ b/ceilometer/files/kilo/ceilometer-server.conf.Debian
@@ -556,7 +556,6 @@
 # Deprecated group/name - [DEFAULT]/rabbit_virtual_host
 #rabbit_virtual_host = /
 rabbit_virtual_host = {{ server.message_queue.virtual_host }}
-rabbit_ha_queues={{ server.message_queue.ha_queues }}
 
 # How frequently to retry connecting with RabbitMQ. (integer value)
 #rabbit_retry_interval = 1
@@ -632,4 +631,4 @@
 
 # Disables X.509 certificate validation when an SSL connection
 # to Identity Service is established. (boolean value)
-#insecure=false
\ No newline at end of file
+#insecure=false
diff --git a/ceilometer/files/liberty/ceilometer-agent.conf.Debian b/ceilometer/files/liberty/ceilometer-agent.conf.Debian
index 4c52ea5..b4f818b 100644
--- a/ceilometer/files/liberty/ceilometer-agent.conf.Debian
+++ b/ceilometer/files/liberty/ceilometer-agent.conf.Debian
@@ -419,7 +419,6 @@
 # Deprecated group/name - [DEFAULT]/rabbit_virtual_host
 #rabbit_virtual_host = /
 rabbit_virtual_host = {{ agent.message_queue.virtual_host }}
-rabbit_ha_queues={{ agent.message_queue.ha_queues }}
 
 # How frequently to retry connecting with RabbitMQ. (integer value)
 #rabbit_retry_interval = 1
@@ -515,4 +514,4 @@
 prefix = {{ agent.publisher.graphite.get('prefix', 'ceilometer') }}.
 append_hostname = true
 
-{%- endif %}
\ No newline at end of file
+{%- endif %}
diff --git a/ceilometer/files/liberty/ceilometer-server.conf.Debian b/ceilometer/files/liberty/ceilometer-server.conf.Debian
index 3238895..1976011 100644
--- a/ceilometer/files/liberty/ceilometer-server.conf.Debian
+++ b/ceilometer/files/liberty/ceilometer-server.conf.Debian
@@ -557,7 +557,6 @@
 # Deprecated group/name - [DEFAULT]/rabbit_virtual_host
 #rabbit_virtual_host = /
 rabbit_virtual_host = {{ server.message_queue.virtual_host }}
-rabbit_ha_queues={{ server.message_queue.ha_queues }}
 
 # How frequently to retry connecting with RabbitMQ. (integer value)
 #rabbit_retry_interval = 1