From 4327d6591c9d6be9a6c0443e462ecfd8084443ed Mon Sep 17 00:00:00 2001
From: Jonathan Arrance <speed3nc@gmail.com>
Date: Sun, 11 Sep 2016 23:28:10 -0400
Subject: [PATCH] Removed trove.conf url stuff.

---
 src/templates/mitaka/trove.conf | 65 +++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/templates/mitaka/trove.conf b/src/templates/mitaka/trove.conf
index 6b844d0..beee38b 100644
--- a/src/templates/mitaka/trove.conf
+++ b/src/templates/mitaka/trove.conf
@@ -2,9 +2,9 @@
 auth_strategy = keystone
 log_dir = /var/log/trove
 trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:5000/v{{ options.keystone-api-version }}.0
-nova_compute_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8774/v2
-cinder_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8776/v1
-swift_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8080/v1/AUTH_
+#nova_compute_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8774/v2
+#cinder_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8776/v1
+#swift_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8080/v1/AUTH_
 notifier_queue_hostname = controller
 
 # Show more verbose log output (sets INFO log level output)
@@ -58,37 +58,48 @@ neutron_service_type = network
 
 
 
-#[oslo_messaging_rabbit]
-#rabbit_host = controller
-#rabbit_userid = openstack
-#rabbit_password = RABBIT_PASS
+[oslo_messaging_rabbit]
+{% if rabbitmq_host or rabbitmq_hosts -%}
+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 -%}
 
-{% include "parts/section-rabbitmq-oslo" %}
-#rabbit_userid = guest
-#rabbit_password = guest
-#rabbit_virtual_host = /
-#rabbit_use_ssl = False
-#rabbit_hosts = 127.0.0.1:5672
+#{% include "parts/section-rabbitmq-oslo" %}
 
 [database]
 #connection = mysql://trove:TROVE_DBPASS@controller/trove
 #{% include "parts/database" %}
 connection = {{ shared_db.uri }}
 
-#{% include "parts/section-keystone-authtoken" %}
-[keystone_authtoken]
-{% if identity_service.auth_host -%}
-auth_uri = {{ identity_service.service_protocol }}://{{
-identity_service.service_host }}:{{ identity_service.service_port }}
-auth_url = {{ identity_service.auth_protocol }}://{{ identity_service.auth_host
-}}:{{ identity_service.auth_port }}
-auth_plugin = password
-project_domain_id = default
-user_domain_id = default
-project_name = {{ identity_service.service_tenant }}
-username = {{ identity_service.service_username }}
-password = {{ identity_service.service_password }}
-{% endif -%}
+{% include "section-keystone-authtoken-mitaka" %}
+#[keystone_authtoken]
+#{% if identity_service.auth_host -%}
+#auth_uri = {{ identity_service.service_protocol }}://{{ identity_service.service_host }}:{{ identity_service.service_port }}
+#auth_url = {{ identity_service.auth_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}
+#auth_plugin = password
+#project_domain_id = default
+#user_domain_id = default
+#project_name = {{ identity_service.service_tenant }}
+#username = {{ identity_service.service_username }}
+#password = {{ identity_service.service_password }}
+#{% endif -%}
 
 [mysql]
 root_on_create = False