summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-03 13:58:55 +0000
committerGerrit Code Review <review@openstack.org>2017-03-03 13:58:55 +0000
commitc4380d9a73a05628b19f39f4eb423c8d2eca1b29 (patch)
treed08d0e14264c4b5dcafeb5486d58a2d2191ae748
parentb05b455502a7631dd4439e592c163e2d468f5066 (diff)
parent44d3f3258005c61dd1384d4a0b4535db651bf57a (diff)
Merge "Adjust to per-service configuration"
-rw-r--r--service/files/backup.sh.j22
-rw-r--r--service/files/keystone.conf.j22
-rw-r--r--service/keystone.yaml6
3 files changed, 5 insertions, 5 deletions
diff --git a/service/files/backup.sh.j2 b/service/files/backup.sh.j2
index 0d8e930..0be31d6 100644
--- a/service/files/backup.sh.j2
+++ b/service/files/backup.sh.j2
@@ -1,6 +1,6 @@
1#!/bin/bash -ex 1#!/bin/bash -ex
2set -o pipefail 2set -o pipefail
3BACKUP_FILE="/var/ccp/backup/keystone/backup-$(date "+%Y%m%d%H%M%S").sql" 3BACKUP_FILE="/var/ccp/backup/keystone/backup-$(date "+%Y%m%d%H%M%S").sql"
4mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \ 4mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address("database") }} \
5 -u {{ keystone.db.username }} -p{{ keystone.db.password }} \ 5 -u {{ keystone.db.username }} -p{{ keystone.db.password }} \
6 --single-transaction {{ keystone.db.name }} > "${BACKUP_FILE}" 6 --single-transaction {{ keystone.db.name }} > "${BACKUP_FILE}"
diff --git a/service/files/keystone.conf.j2 b/service/files/keystone.conf.j2
index 763fdf1..5a25291 100644
--- a/service/files/keystone.conf.j2
+++ b/service/files/keystone.conf.j2
@@ -8,7 +8,7 @@ notification_format = {{ keystone.notifications.format }}
8{% endif %} 8{% endif %}
9 9
10[database] 10[database]
11connection = 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 %} 11connection = 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 %}
12max_retries = -1 12max_retries = -1
13max_overflow = 60 13max_overflow = 60
14 14
diff --git a/service/keystone.yaml b/service/keystone.yaml
index 9298117..4d92579 100644
--- a/service/keystone.yaml
+++ b/service/keystone.yaml
@@ -38,10 +38,10 @@ service:
38 - fernet-manage 38 - fernet-manage
39 - name: keystone-db-create 39 - name: keystone-db-create
40 dependencies: 40 dependencies:
41 - {{ service.database }} 41 - database
42 type: single 42 type: single
43 command: 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 create user '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}' 45 create user '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}'
46 {% if db.tls.enabled %} require ssl {% endif %}; 46 {% if db.tls.enabled %} require ssl {% endif %};
47 grant all privileges on {{ keystone.db.name }}.* to '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}' 47 grant all privileges on {{ keystone.db.name }}.* to '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}'
@@ -75,7 +75,7 @@ service:
75 dependencies: 75 dependencies:
76 - memcached 76 - memcached
77 # {% if keystone.notifications.enable -%} 77 # {% if keystone.notifications.enable -%}
78 - "{{ messaging.dependencies[messaging.backend.notifications] }}" 78 - notifications
79 # {%- endif %} 79 # {%- endif %}
80 files: 80 files:
81 - keystone-conf 81 - keystone-conf