Use database service name from config

Change-Id: Ib180686ab7f30dbca3d62f1ec24ea18e7127fe92
Depends-on: Iacc3f02fdd4f39edb5c95d144ffff00b65baa55a

service/cinder-api.yaml

@@ -13,10 +13,10 @@ service:
       pre:
         - name: cinder-db-create
           dependencies:
-            - mariadb
+            - {{ service.database }}
           type: single
           command:
-            mysql -u root -p{{ db.root_password }} -h mariadb -e "create database {{ cinder.db.name }};
+            mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ cinder.db.name }};
             grant all privileges on {{ cinder.db.name }}.* to '{{ cinder.db.username }}'@'%' identified by '{{ cinder.db.password }}';"
         - name: cinder-db-sync
           files:

service/files/cinder.conf.j2

@@ -25,7 +25,7 @@ auth_strategy = keystone
 transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rabbitmq') }}
 
 [database]
-connection = mysql+pymysql://{{ cinder.db.username }}:{{ cinder.db.password }}@{{ address('mariadb') }}/{{ cinder.db.name }}
+connection = mysql+pymysql://{{ cinder.db.username }}:{{ cinder.db.password }}@{{ address(service.database) }}/{{ cinder.db.name }}
 max_retries = -1
 
 [keystone_authtoken]