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

Change-Id: I24b0e7ac4fcc798933a5492ad36533b0fdb1b8df
Depends-On: Ia4d29167cea6dfd19a1970706aafda51a31d5b24
---
 service/cinder-api.yaml      | 8 ++++----
 service/files/cinder.conf.j2 | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/service/cinder-api.yaml b/service/cinder-api.yaml
index 6096810..a7382f5 100644
--- a/service/cinder-api.yaml
+++ b/service/cinder-api.yaml
@@ -9,10 +9,10 @@ service:
       pre:
         - name: cinder-db-create
           dependencies:
-            - {{ service.database }}
+            - database
           type: single
           command:
-            mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ cinder.db.name }};
+            mysql -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database {{ cinder.db.name }};
             create user '{{ cinder.db.username }}'@'%' identified by '{{ cinder.db.password }}'
             {% if db.tls.enabled %} require ssl {% endif %};
             grant all privileges on {{ cinder.db.name }}.* to '{{ cinder.db.username }}'@'%' identified by '{{ cinder.db.password }}'
@@ -107,8 +107,8 @@ service:
           - cinder-conf
         dependencies:
           - memcached
-          - "{{ messaging.dependencies[messaging.backend.rpc] }}"
-          - "{{ messaging.dependencies[messaging.backend.notifications] }}"
+          - rpc
+          - notifications
     # {% if cinder.tls.enabled %}
     - name: nginx-cinder-api
       image: nginx
diff --git a/service/files/cinder.conf.j2 b/service/files/cinder.conf.j2
index 796396f..4993ab7 100644
--- a/service/files/cinder.conf.j2
+++ b/service/files/cinder.conf.j2
@@ -23,7 +23,7 @@ glance_catalog_info = image:glance:internalURL
 auth_strategy = keystone
 
 [database]
-connection = mysql+pymysql://{{ cinder.db.username }}:{{ cinder.db.password }}@{{ address(service.database) }}/{{ cinder.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
+connection = mysql+pymysql://{{ cinder.db.username }}:{{ cinder.db.password }}@{{ address("database") }}/{{ cinder.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
 max_retries = -1
 
 {{ keystone_authtoken.keystone_authtoken(cinder.username, cinder.password) }}