Browse Source

Merge "Moving tls flag from percona to db group"

changes/78/436378/1
Jenkins 2 years ago
parent
commit
e96c3bc529

+ 1
- 1
service/files/backup.sh.j2 View File

@@ -1,6 +1,6 @@
1 1
 #!/bin/bash -ex
2 2
 set -o pipefail
3 3
 BACKUP_FILE="/var/ccp/backup/glance/backup-$(date "+%Y%m%d%H%M%S").sql"
4
-mysqldump {% if percona.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
4
+mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
5 5
     -u {{ glance.db.username }} -p{{ glance.db.password }} \
6 6
     --single-transaction {{ glance.db.name }} > "${BACKUP_FILE}"

+ 1
- 1
service/files/glance-api.conf.j2 View File

@@ -16,7 +16,7 @@ show_image_direct_url = true
16 16
 show_multiple_locations = true
17 17
 
18 18
 [database]
19
-connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
19
+connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
20 20
 max_retries = -1
21 21
 
22 22
 {{ keystone_authtoken.keystone_authtoken(glance.user, glance.password) }}

+ 1
- 1
service/files/glance-registry.conf.j2 View File

@@ -9,7 +9,7 @@ bind_host = {{ network_topology["private"]["address"] }}
9 9
 bind_port = {{ glance.registry_port.cont }}
10 10
 
11 11
 [database]
12
-connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
12
+connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
13 13
 max_retries = -1
14 14
 
15 15
 {{ keystone_authtoken.keystone_authtoken(glance.user, glance.password) }}

+ 4
- 2
service/glance-api.yaml View File

@@ -18,9 +18,9 @@ service:
18 18
           command:
19 19
             mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ glance.db.name }};
20 20
             create user '{{ glance.db.username }}'@'%' identified by '{{ glance.db.password }}'
21
-            {% if percona.tls.enabled %} require ssl {% endif %};
21
+            {% if db.tls.enabled %} require ssl {% endif %};
22 22
             grant all privileges on {{ glance.db.name }}.* to '{{ glance.db.username }}'@'%' identified by '{{ glance.db.password }}'
23
-            {% if percona.tls.enabled %} require ssl {% endif %};"
23
+            {% if db.tls.enabled %} require ssl {% endif %};"
24 24
         - name: glance-db-sync
25 25
           files:
26 26
             - glance-api
@@ -69,6 +69,8 @@ service:
69 69
           - glance-swift-conf
70 70
           # {% endif %}
71 71
         command: glance-api
72
+        dependencies:
73
+          - memcached
72 74
       # {% if glance.bootstrap.enable %}
73 75
       post:
74 76
         - name: glance-cirros-image-upload

Loading…
Cancel
Save