Use database service name from config

Change-Id: I790153002af8b8c20f946934a297b8ea9c83093a
Depends-on: Iacc3f02fdd4f39edb5c95d144ffff00b65baa55a
This commit is contained in:
Sergey Reshetnyak 2016-11-17 15:52:42 +03:00
parent 8fa2b16efd
commit 4165bc7522
3 changed files with 4 additions and 4 deletions

View File

@ -18,7 +18,7 @@ cinder_catalog_info = volume:cinder:internalURL
show_multiple_locations = True
[database]
connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address('mariadb') }}/{{ glance.db.name }}
connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}
max_retries = -1
[keystone_authtoken]

View File

@ -15,7 +15,7 @@ cinder_catalog_info = volume:cinder:internalURL
show_multiple_locations = True
[database]
connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address('mariadb') }}/{{ glance.db.name }}
connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}
max_retries = -1
[keystone_authtoken]

View File

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