Use database service name from config
Change-Id: Ief38f9ae826133d3c005c0a8881504e14bd406ad Depends-on: Iacc3f02fdd4f39edb5c95d144ffff00b65baa55a
This commit is contained in:
parent
b1e645e5a0
commit
23246cf6da
|
@ -7,7 +7,7 @@ region_name_for_services = RegionOne
|
||||||
rpc_backend = rabbit
|
rpc_backend = rabbit
|
||||||
|
|
||||||
[database]
|
[database]
|
||||||
connection = mysql+pymysql://{{ heat.db.username }}:{{ heat.db.password }}@{{ address('mariadb') }}/{{ heat.db.name }}
|
connection = mysql+pymysql://{{ heat.db.username }}:{{ heat.db.password }}@{{ address(service.database) }}/{{ heat.db.name }}
|
||||||
|
|
||||||
[oslo_messaging_rabbit]
|
[oslo_messaging_rabbit]
|
||||||
rabbit_userid = {{ rabbitmq.user }}
|
rabbit_userid = {{ rabbitmq.user }}
|
||||||
|
|
|
@ -14,10 +14,10 @@ service:
|
||||||
pre:
|
pre:
|
||||||
- name: heat-db-create
|
- name: heat-db-create
|
||||||
dependencies:
|
dependencies:
|
||||||
- mariadb
|
- {{ service.database }}
|
||||||
type: single
|
type: single
|
||||||
command:
|
command:
|
||||||
mysql -u root -p{{ db.root_password }} -h {{ address('mariadb') }} -e "create database {{ heat.db.name }};
|
mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ heat.db.name }};
|
||||||
grant all privileges on {{ heat.db.name }}.* to '{{ heat.db.username }}'@'%' identified by '{{ heat.db.password }}';"
|
grant all privileges on {{ heat.db.name }}.* to '{{ heat.db.username }}'@'%' identified by '{{ heat.db.password }}';"
|
||||||
- name: heat-db-sync
|
- name: heat-db-sync
|
||||||
files:
|
files:
|
||||||
|
|
Loading…
Reference in New Issue