Browse Source

Moving tls flag from percona to db group

Change-Id: Iaea45afcce3fd37d179bca90310c8d2da28ce315
Depends-On: I2ff95f7a1cbb14cb1cd9e35677f95c30a4523340
Andrey Pavlov 2 years ago
parent
commit
869c5dc9da
2 changed files with 3 additions and 3 deletions
  1. 1
    1
      service/files/heat.conf.j2
  2. 2
    2
      service/heat-api.yaml

+ 1
- 1
service/files/heat.conf.j2 View File

@@ -16,7 +16,7 @@ reauthentication_auth_method = trusts
16 16
 endpoint_type = internalURL
17 17
 
18 18
 [database]
19
-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 %}
19
+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 %}
20 20
 
21 21
 {{ keystone_authtoken.keystone_authtoken(heat.user, heat.password) }}
22 22
 

+ 2
- 2
service/heat-api.yaml View File

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

Loading…
Cancel
Save