Adjust to per-service configuration

Change-Id: I78b730ad4c9c726c37b642886104b5c502c10a9c
Depends-On: Ia4d29167cea6dfd19a1970706aafda51a31d5b24
This commit is contained in:
Andrey Pavlov 2017-02-27 09:41:32 +00:00
parent 0b76bf68dc
commit aa0d144267
2 changed files with 4 additions and 4 deletions

View File

@ -16,7 +16,7 @@ host_ip = {{ network_topology["private"]["address"] }}
port = {{ ironic.api_port.cont }}
[database]
connection = mysql+pymysql://{{ ironic.db.username }}:{{ ironic.db.password }}@{{ address(service.database) }}/{{ ironic.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
connection = mysql+pymysql://{{ ironic.db.username }}:{{ ironic.db.password }}@{{ address("database") }}/{{ ironic.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
max_retries = -1
{{ keystone_authtoken.keystone_authtoken(ironic.username, ironic.password) }}

View File

@ -15,13 +15,13 @@ service:
pre:
- name: ironic-db-create
type: single
command: mysql -v -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database `{{ ironic.db.name }}`;
command: mysql -v -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database `{{ ironic.db.name }}`;
create user '{{ ironic.db.username }}'@'%' identified by '{{ ironic.db.password }}'
{% if db.tls.enabled %} require ssl {% endif %};
grant all privileges on `{{ ironic.db.name }}`.* to '{{ ironic.db.username }}'@'%' identified by '{{ ironic.db.password }}'
{% if db.tls.enabled %} require ssl {% endif %};"
dependencies:
- {{ service.database }}
- database
- name: ironic-db-sync
type: single
command: ironic-dbsync
@ -68,7 +68,7 @@ service:
files:
- ironic.conf
dependencies:
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
- rpc
files:
ironic.conf:
path: /etc/ironic/ironic.conf