Moving tls flag from percona to db group
Change-Id: I7204d5ab2a27efdc8fc5f814d36f892f9da74cbe Depends-On: I2ff95f7a1cbb14cb1cd9e35677f95c30a4523340
This commit is contained in:
parent
7abcf02247
commit
3a67a1b366
|
@ -1,10 +1,10 @@
|
|||
#!/bin/bash -ex
|
||||
set -o pipefail
|
||||
BACKUP_FILE="/var/ccp/backup/nova/backup-$(date "+%Y%m%d%H%M%S").sql"
|
||||
mysqldump {% if percona.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
|
||||
mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
|
||||
-u {{ nova.db.username }} -p{{ nova.db.password }} \
|
||||
--single-transaction {{ nova.db.name }} > "${BACKUP_FILE}"
|
||||
BACKUP_FILE_API="/var/ccp/backup/nova/backup-$(date "+%Y%m%d%H%M%S")-api.sql"
|
||||
mysqldump {% if percona.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
|
||||
mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
|
||||
-u {{ nova.db.username }} -p{{ nova.db.password }} \
|
||||
--single-transaction {{ nova.db.api_name }} > "${BACKUP_FILE_API}"
|
||||
|
|
|
@ -112,13 +112,13 @@ username = {{ neutron.username }}
|
|||
password = {{ neutron.password }}
|
||||
|
||||
[database]
|
||||
connection = mysql+pymysql://{{ nova.db.username }}:{{ nova.db.password }}@{{ address(service.database) }}/{{ nova.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
||||
connection = mysql+pymysql://{{ nova.db.username }}:{{ nova.db.password }}@{{ address(service.database) }}/{{ nova.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
||||
max_pool_size = 50
|
||||
max_overflow = 1000
|
||||
max_retries = -1
|
||||
|
||||
[api_database]
|
||||
connection = mysql+pymysql://{{ nova.db.username }}:{{ nova.db.password }}@{{ address(service.database) }}/{{ nova.db.api_name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
||||
connection = mysql+pymysql://{{ nova.db.username }}:{{ nova.db.password }}@{{ address(service.database) }}/{{ nova.db.api_name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
||||
max_retries = -1
|
||||
|
||||
[cache]
|
||||
|
|
|
@ -17,11 +17,11 @@ service:
|
|||
command: mysql -v -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e 'create database `{{ nova.db.name }}`;
|
||||
create database `{{ nova.db.api_name }}`;
|
||||
create user "{{ nova.db.username }}"@"%" identified by "{{ nova.db.password }}"
|
||||
{% if percona.tls.enabled %} require ssl {% endif %};
|
||||
{% if db.tls.enabled %} require ssl {% endif %};
|
||||
grant all privileges on `{{ nova.db.name }}`.* to "{{ nova.db.username }}"@"%" identified by "{{ nova.db.password }}"
|
||||
{% if percona.tls.enabled %} require ssl {% endif %};
|
||||
{% if db.tls.enabled %} require ssl {% endif %};
|
||||
grant all privileges on `{{ nova.db.api_name }}`.* to "{{ nova.db.username }}"@"%" identified by "{{ nova.db.password }}"
|
||||
{% if percona.tls.enabled %} require ssl {% endif %};'
|
||||
{% if db.tls.enabled %} require ssl {% endif %};'
|
||||
dependencies:
|
||||
- {{ service.database }}
|
||||
files:
|
||||
|
|
Loading…
Reference in New Issue