x
/
fuel-ccp-heat
Code Issues Proposed changes

Moving tls flag from percona to db group 

Change-Id: Iaea45afcce3fd37d179bca90310c8d2da28ce315
Depends-On: I2ff95f7a1cbb14cb1cd9e35677f95c30a4523340
This commit is contained in:
Andrey Pavlov 2017-02-20 14:05:08 +00:00
parent 89cd8f2ab2
commit 869c5dc9da
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/files/heat.conf.j2
View File

@ -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 percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
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 %}
{{ keystone_authtoken.keystone_authtoken(heat.user, heat.password) }}

4
service/heat-api.yaml
View File

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