Moving tls flag from percona to db group

Change-Id: I7f12754ca1516ebe7a7e8eead7ff42cfbce04978
Depends-On: I2ff95f7a1cbb14cb1cd9e35677f95c30a4523340
This commit is contained in:
Andrey Pavlov 2017-02-20 14:25:54 +00:00
parent 9ac8ee2e02
commit 1485524f17
2 changed files with 3 additions and 3 deletions

View File

@ -14,9 +14,9 @@ service:
command:
mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ cinder.db.name }};
create user '{{ cinder.db.username }}'@'%' identified by '{{ cinder.db.password }}'
{% if percona.tls.enabled %} require ssl {% endif %};
{% if db.tls.enabled %} require ssl {% endif %};
grant all privileges on {{ cinder.db.name }}.* to '{{ cinder.db.username }}'@'%' identified by '{{ cinder.db.password }}'
{% if percona.tls.enabled %} require ssl {% endif %};"
{% if db.tls.enabled %} require ssl {% endif %};"
- name: cinder-db-sync
files:
- cinder-conf

View File

@ -24,7 +24,7 @@ glance_catalog_info = image:glance:internalURL
auth_strategy = keystone
[database]
connection = mysql+pymysql://{{ cinder.db.username }}:{{ cinder.db.password }}@{{ address(service.database) }}/{{ cinder.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
connection = mysql+pymysql://{{ cinder.db.username }}:{{ cinder.db.password }}@{{ address(service.database) }}/{{ cinder.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
max_retries = -1
[keystone_authtoken]