Browse Source

Merge "Adjust to per-service configuration"

changes/57/441757/1
Jenkins 2 years ago
parent
commit
c4380d9a73
3 changed files with 5 additions and 5 deletions
  1. 1
    1
      service/files/backup.sh.j2
  2. 1
    1
      service/files/keystone.conf.j2
  3. 3
    3
      service/keystone.yaml

+ 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/keystone/backup-$(date "+%Y%m%d%H%M%S").sql"
4
-mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
4
+mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address("database") }} \
5 5
     -u {{ keystone.db.username }} -p{{ keystone.db.password }} \
6 6
     --single-transaction {{ keystone.db.name }} > "${BACKUP_FILE}"

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

@@ -8,7 +8,7 @@ notification_format = {{ keystone.notifications.format }}
8 8
 {% endif %}
9 9
 
10 10
 [database]
11
-connection = mysql+pymysql://{{ keystone.db.username }}:{{ keystone.db.password }}@{{ address(service.database) }}/{{ keystone.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
11
+connection = mysql+pymysql://{{ keystone.db.username }}:{{ keystone.db.password }}@{{ address("database") }}/{{ keystone.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
12 12
 max_retries = -1
13 13
 max_overflow = 60
14 14
 

+ 3
- 3
service/keystone.yaml View File

@@ -38,10 +38,10 @@ service:
38 38
             - fernet-manage
39 39
         - name: keystone-db-create
40 40
           dependencies:
41
-            - {{ service.database }}
41
+            - database
42 42
           type: single
43 43
           command:
44
-            mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ keystone.db.name }};
44
+            mysql -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database {{ keystone.db.name }};
45 45
             create user '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}'
46 46
             {% if db.tls.enabled %} require ssl {% endif %};
47 47
             grant all privileges on {{ keystone.db.name }}.* to '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}'
@@ -75,7 +75,7 @@ service:
75 75
         dependencies:
76 76
           - memcached
77 77
           # {% if keystone.notifications.enable -%}
78
-          - "{{ messaging.dependencies[messaging.backend.notifications] }}"
78
+          - notifications
79 79
           # {%- endif %}
80 80
         files:
81 81
           - keystone-conf

Loading…
Cancel
Save