Adjust to per-service configuration
Change-Id: Ibf904393843030511a98bc983e57557ad6a9eb77 Depends-On: Ia4d29167cea6dfd19a1970706aafda51a31d5b24
This commit is contained in:
parent
fd81b5e308
commit
44d3f32580
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash -ex
|
||||
set -o pipefail
|
||||
BACKUP_FILE="/var/ccp/backup/keystone/backup-$(date "+%Y%m%d%H%M%S").sql"
|
||||
mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
|
||||
mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address("database") }} \
|
||||
-u {{ keystone.db.username }} -p{{ keystone.db.password }} \
|
||||
--single-transaction {{ keystone.db.name }} > "${BACKUP_FILE}"
|
||||
|
|
|
@ -8,7 +8,7 @@ notification_format = {{ keystone.notifications.format }}
|
|||
{% endif %}
|
||||
|
||||
[database]
|
||||
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 %}
|
||||
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 %}
|
||||
max_retries = -1
|
||||
max_overflow = 60
|
||||
|
||||
|
|
|
@ -36,10 +36,10 @@ service:
|
|||
- fernet-manage
|
||||
- name: keystone-db-create
|
||||
dependencies:
|
||||
- {{ service.database }}
|
||||
- database
|
||||
type: single
|
||||
command:
|
||||
mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ keystone.db.name }};
|
||||
mysql -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database {{ keystone.db.name }};
|
||||
create user '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}'
|
||||
{% if db.tls.enabled %} require ssl {% endif %};
|
||||
grant all privileges on {{ keystone.db.name }}.* to '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}'
|
||||
|
@ -72,7 +72,7 @@ service:
|
|||
dependencies:
|
||||
- memcached
|
||||
# {% if keystone.notifications.enable -%}
|
||||
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
|
||||
- notifications
|
||||
# {%- endif %}
|
||||
files:
|
||||
- keystone-conf
|
||||
|
|
Loading…
Reference in New Issue