Moving tls flag from percona to db group
Change-Id: I07e2ea47740d1cec186ccc73ea7776817f5f44a2 Depends-On: I2ff95f7a1cbb14cb1cd9e35677f95c30a4523340
This commit is contained in:
parent
147cb68a0f
commit
31400f1923
|
@ -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 percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
||||
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 %}
|
||||
max_retries = -1
|
||||
|
||||
{{ keystone_authtoken.keystone_authtoken(ironic.username, ironic.password) }}
|
||||
|
|
|
@ -17,9 +17,9 @@ service:
|
|||
type: single
|
||||
command: mysql -v -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database `{{ ironic.db.name }}`;
|
||||
create user '{{ ironic.db.username }}'@'%' identified by '{{ ironic.db.password }}'
|
||||
{% if percona.tls.enabled %} require ssl {% endif %};
|
||||
{% if db.tls.enabled %} require ssl {% endif %};
|
||||
grant all privileges on `{{ ironic.db.name }}`.* to '{{ ironic.db.username }}'@'%' identified by '{{ ironic.db.password }}'
|
||||
{% if percona.tls.enabled %} require ssl {% endif %};"
|
||||
{% if db.tls.enabled %} require ssl {% endif %};"
|
||||
dependencies:
|
||||
- {{ service.database }}
|
||||
- name: ironic-db-sync
|
||||
|
|
Loading…
Reference in New Issue