Moving tls flag from percona to db group
Change-Id: I7a97d36a3ccb39fa4b15ae08c7e4b68d8eaaee57 Depends-On: I2ff95f7a1cbb14cb1cd9e35677f95c30a4523340
This commit is contained in:
parent
1a6c046192
commit
0a8d89a7bc
|
@ -16,7 +16,7 @@ transport_url = rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address(
|
|||
heat_enable_wait_condition = {{ sahara.enable_wait_condition }}
|
||||
|
||||
[database]
|
||||
connection = mysql+pymysql://{{ sahara.db.username }}:{{ sahara.db.password }}@{{ address(service.database) }}/{{ sahara.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
||||
connection = mysql+pymysql://{{ sahara.db.username }}:{{ sahara.db.password }}@{{ address(service.database) }}/{{ sahara.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
||||
max_retries = -1
|
||||
|
||||
{{ keystone_authtoken.keystone_authtoken(sahara.auth.user, sahara.auth.password) }}
|
||||
|
|
|
@ -15,9 +15,9 @@ service:
|
|||
command:
|
||||
mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ sahara.db.name }};
|
||||
create user '{{ sahara.db.username }}'@'%' identified by '{{ sahara.db.password }}'
|
||||
{% if percona.tls.enabled %} require ssl {% endif %};
|
||||
{% if db.tls.enabled %} require ssl {% endif %};
|
||||
grant all privileges on {{ sahara.db.name }}.* to '{{ sahara.db.username }}'@'%' identified by '{{ sahara.db.password }}'
|
||||
{% if percona.tls.enabled %} require ssl {% endif %};"
|
||||
{% if db.tls.enabled %} require ssl {% endif %};"
|
||||
- name: sahara-db-sync
|
||||
files:
|
||||
- sahara-conf
|
||||
|
|
Loading…
Reference in New Issue