From 0f96e2568535c02c1e37f52900185eb27e79d3c1 Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <apavlov@mirantis.com>
Date: Mon, 27 Feb 2017 09:43:08 +0000
Subject: [PATCH] Adjust to per-service configuration

Change-Id: I96184590231b48aedf695296460ededff0cd6e7b
Depends-On: Ia4d29167cea6dfd19a1970706aafda51a31d5b24
---
 service/files/sahara.conf.j2 | 5 +++--
 service/sahara-api.yaml      | 6 +++---
 service/sahara-engine.yaml   | 1 -
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/service/files/sahara.conf.j2 b/service/files/sahara.conf.j2
index 098e641..21f96cc 100644
--- a/service/files/sahara.conf.j2
+++ b/service/files/sahara.conf.j2
@@ -11,12 +11,11 @@ host = {{ network_topology["private"]["address"] }}
 port = {{ sahara.port.cont }}
 
 periodic_coordinator_backend_url = memcached://{{ address("memcached", memcached.port) }}
-transport_url = rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address("rabbitmq", rabbitmq.port) }}/
 
 heat_enable_wait_condition = {{ sahara.enable_wait_condition }}
 
 [database]
-connection = mysql+pymysql://{{ sahara.db.username }}:{{ sahara.db.password }}@{{ address(service.database) }}/{{ sahara.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
+connection = mysql+pymysql://{{ sahara.db.username }}:{{ sahara.db.password }}@{{ address("database") }}/{{ sahara.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
 max_retries = -1
 
 {{ keystone_authtoken.keystone_authtoken(sahara.auth.user, sahara.auth.password) }}
@@ -28,3 +27,5 @@ admin_tenant_name = {{ openstack.project_name }}
 
 [oslo_messaging_notifications]
 driver = noop
+
+{{ oslo_messaging[messaging.backend.rpc]('rpc_config') }}
diff --git a/service/sahara-api.yaml b/service/sahara-api.yaml
index 7ee3edc..13b4f77 100644
--- a/service/sahara-api.yaml
+++ b/service/sahara-api.yaml
@@ -10,10 +10,10 @@ service:
       pre:
         - name: sahara-db-create
           dependencies:
-            - {{ service.database }}
+            - database
           type: single
           command:
-            mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ sahara.db.name }};
+            mysql -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database {{ sahara.db.name }};
             create user '{{ sahara.db.username }}'@'%' identified by '{{ sahara.db.password }}'
             {% if db.tls.enabled %} require ssl {% endif %};
             grant all privileges on {{ sahara.db.name }}.* to '{{ sahara.db.username }}'@'%' identified by '{{ sahara.db.password }}'
@@ -59,7 +59,7 @@ service:
         files:
           - sahara-conf
         dependencies:
-          - rabbitmq
+          - rpc
         command: sahara-api --config-file /etc/sahara/sahara.conf
 
 files:
diff --git a/service/sahara-engine.yaml b/service/sahara-engine.yaml
index ee23850..6dd2134 100644
--- a/service/sahara-engine.yaml
+++ b/service/sahara-engine.yaml
@@ -9,7 +9,6 @@ service:
         files:
           - sahara-conf
         dependencies:
-          - rabbitmq
           - sahara-api
         command: sahara-engine --config-file /etc/sahara/sahara.conf