From 415d97a858cf663828b4cc0edbd1092757f678c6 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Wed, 25 Mar 2015 09:22:50 +0000
Subject: [PATCH] Switch to using charm-helper templates for rabbitmq

---
 templates/kilo/neutron.conf      |  2 +-
 templates/kilo/nova.conf         |  2 +-
 templates/parts/section-rabbitmq | 22 ----------------------
 3 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 templates/parts/section-rabbitmq

diff --git a/templates/kilo/neutron.conf b/templates/kilo/neutron.conf
index b6ae7361..e541f337 100644
--- a/templates/kilo/neutron.conf
+++ b/templates/kilo/neutron.conf
@@ -17,7 +17,7 @@ network_device_mtu = {{ network_device_mtu }}
 [agent]
 root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
 
-{% include "parts/section-rabbitmq" %}
+{% include "section-rabbitmq-oslo" %}
 
 [oslo_concurrency]
 lock_path = /var/lock/neutron
diff --git a/templates/kilo/nova.conf b/templates/kilo/nova.conf
index 14a6e68c..11316956 100644
--- a/templates/kilo/nova.conf
+++ b/templates/kilo/nova.conf
@@ -24,7 +24,7 @@ admin_auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v
 service_metadata_proxy=True
 metadata_proxy_shared_secret={{ shared_secret }}
 
-{% include "parts/section-rabbitmq" %}
+{% include "section-rabbitmq-oslo" %}
 
 [oslo_concurrency]
 lock_path=/var/lock/nova
diff --git a/templates/parts/section-rabbitmq b/templates/parts/section-rabbitmq
deleted file mode 100644
index df21178b..00000000
--- a/templates/parts/section-rabbitmq
+++ /dev/null
@@ -1,22 +0,0 @@
-{% if rabbitmq_host or rabbitmq_hosts -%}
-[oslo_messaging_rabbit]
-rabbit_userid = {{ rabbitmq_user }}
-rabbit_virtual_host = {{ rabbitmq_virtual_host }}
-rabbit_password = {{ rabbitmq_password }}
-{% if rabbitmq_hosts -%}
-rabbit_hosts = {{ rabbitmq_hosts }}
-{% if rabbitmq_ha_queues -%}
-rabbit_ha_queues = True
-rabbit_durable_queues = False
-{% endif -%}
-{% else -%}
-rabbit_host = {{ rabbitmq_host }}
-{% endif -%}
-{% if rabbit_ssl_port -%}
-rabbit_use_ssl = True
-rabbit_port = {{ rabbit_ssl_port }}
-{% if rabbit_ssl_ca -%}
-kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
-{% endif -%}
-{% endif -%}
-{% endif -%}
\ No newline at end of file