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

Change-Id: I76ad2841d74509621d0176a6d794e1e515a31eee
Depends-On: Ia4d29167cea6dfd19a1970706aafda51a31d5b24
---
 service/files/heat.conf.j2 | 2 +-
 service/heat-api-cfn.yaml  | 2 +-
 service/heat-api.yaml      | 6 +++---
 service/heat-engine.yaml   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/service/files/heat.conf.j2 b/service/files/heat.conf.j2
index 3ad4fa4..51eb1be 100644
--- a/service/files/heat.conf.j2
+++ b/service/files/heat.conf.j2
@@ -16,7 +16,7 @@ reauthentication_auth_method = trusts
 endpoint_type = internalURL
 
 [database]
-connection = mysql+pymysql://{{ heat.db.username }}:{{ heat.db.password }}@{{ address(service.database) }}/{{ heat.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
+connection = mysql+pymysql://{{ heat.db.username }}:{{ heat.db.password }}@{{ address("database") }}/{{ heat.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
 
 {{ keystone_authtoken.keystone_authtoken(heat.user, heat.password) }}
 
diff --git a/service/heat-api-cfn.yaml b/service/heat-api-cfn.yaml
index 37d1542..4dd912b 100644
--- a/service/heat-api-cfn.yaml
+++ b/service/heat-api-cfn.yaml
@@ -33,7 +33,7 @@ service:
             openstack endpoint create --region RegionOne cloudformation admin {{ address('heat-api-cfn', heat.api_cfn_port, with_scheme=True) }}/v1
       daemon:
         dependencies:
-          - "{{ messaging.dependencies[messaging.backend.rpc] }}"
+          - rpc
           # heat-api in dependencies, because it prepares DB, which will be used
           - heat-api
         files:
diff --git a/service/heat-api.yaml b/service/heat-api.yaml
index f30c309..6b7d4ce 100644
--- a/service/heat-api.yaml
+++ b/service/heat-api.yaml
@@ -9,10 +9,10 @@ service:
       pre:
         - name: heat-db-create
           dependencies:
-            - {{ service.database }}
+            - database
           type: single
           command:
-            mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ heat.db.name }};
+            mysql -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database {{ heat.db.name }};
             create user '{{ heat.db.username }}'@'%' identified by '{{ heat.db.password }}'
             {% if db.tls.enabled %} require ssl {% endif %};
             grant all privileges on {{ heat.db.name }}.* to '{{ heat.db.username }}'@'%' identified by '{{ heat.db.password }}'
@@ -96,7 +96,7 @@ service:
             - heat-grant-doman-user-admin-privileges
       daemon:
         dependencies:
-          - "{{ messaging.dependencies[messaging.backend.rpc] }}"
+          - rpc
         files:
           - heat-conf
         command: heat-api --config-file /etc/heat/heat.conf
diff --git a/service/heat-engine.yaml b/service/heat-engine.yaml
index 6057cb2..1d89a34 100644
--- a/service/heat-engine.yaml
+++ b/service/heat-engine.yaml
@@ -8,8 +8,8 @@ service:
         command: heat-engine --config-file /etc/heat/heat.conf
         dependencies:
           - heat-api
-          - "{{ messaging.dependencies[messaging.backend.rpc] }}"
-          - "{{ messaging.dependencies[messaging.backend.notifications] }}"
+          - rpc
+          - notifications
         files:
           - heat.conf
 files: