Adjust to per-service configuration
Change-Id: I76ad2841d74509621d0176a6d794e1e515a31eee Depends-On: Ia4d29167cea6dfd19a1970706aafda51a31d5b24
This commit is contained in:
parent
869c5dc9da
commit
e5ada4b0a0
|
@ -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) }}
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue