Merge "Adjust to per-service configuration"

This commit is contained in:
Jenkins 2017-03-03 13:57:37 +00:00 committed by Gerrit Code Review
commit 88e7544475
6 changed files with 12 additions and 12 deletions

View File

@ -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 db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address("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 db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address("database") }} \
-u {{ nova.db.username }} -p{{ nova.db.password }} \
--single-transaction {{ nova.db.api_name }} > "${BACKUP_FILE_API}"

View File

@ -132,13 +132,13 @@ username = {{ neutron.username }}
password = {{ neutron.password }}
[database]
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 %}
connection = mysql+pymysql://{{ nova.db.username }}:{{ nova.db.password }}@{{ address("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 db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
connection = mysql+pymysql://{{ nova.db.username }}:{{ nova.db.password }}@{{ address("database") }}/{{ nova.db.api_name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
max_retries = -1
[cache]

View File

@ -14,7 +14,7 @@ service:
pre:
- name: nova-db-create
type: single
command: mysql -v -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e 'create database `{{ nova.db.name }}`;
command: mysql -v -u root -p{{ db.root_password }} -h {{ address("database") }} -e 'create database `{{ nova.db.name }}`;
create database `{{ nova.db.api_name }}`;
create user "{{ nova.db.username }}"@"%" identified by "{{ nova.db.password }}"
{% if db.tls.enabled %} require ssl {% endif %};
@ -23,7 +23,7 @@ service:
grant all privileges on `{{ nova.db.api_name }}`.* to "{{ nova.db.username }}"@"%" identified by "{{ nova.db.password }}"
{% if db.tls.enabled %} require ssl {% endif %};'
dependencies:
- {{ service.database }}
- database
files:
- nova.conf
- name: nova-db-sync

View File

@ -33,8 +33,8 @@ service:
- nova-db-migrations
- nova-libvirt:local
- nova-conductor
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
- rpc
- notifications
files:
- nova.conf
# {% if nova.libvirt.tls.enabled %}

View File

@ -10,8 +10,8 @@ service:
- nova.conf
dependencies:
- nova-db-migrations
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
- rpc
- notifications
files:
nova.conf:
path: /etc/nova/nova.conf

View File

@ -10,8 +10,8 @@ service:
- nova.conf
dependencies:
- nova-db-migrations
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
- rpc
- notifications
files:
nova.conf:
path: /etc/nova/nova.conf