Adjust to per-service configuration

Change-Id: Iba26e7fd74f2e75d93f1863d48f89cbec344fd83
Depends-On: Ia4d29167cea6dfd19a1970706aafda51a31d5b24
This commit is contained in:
Andrey Pavlov 2017-02-27 09:55:20 +00:00
parent 6d351b3fc2
commit 935a186bbc
3 changed files with 7 additions and 7 deletions

View File

@ -9,10 +9,10 @@ service:
pre:
- name: designate-main-db-create
dependencies:
- {{ service.database }}
- database
type: single
command:
mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ designate.db.name.main_database }};
mysql -u root -p{{ db.root_password }} -h {{ address('database') }} -e "create database {{ designate.db.name.main_database }};
create user '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
{% if db.tls.enabled %} require ssl {% endif %};
grant all privileges on {{ designate.db.name.main_database }}.* to '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
@ -56,7 +56,7 @@ service:
command: openstack endpoint create --region RegionOne dns admin {{ address('designate-api', designate.api_port, with_scheme=True) }}
daemon:
dependencies:
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
- rpc
files:
- designate-conf
- api-paste

View File

@ -7,11 +7,11 @@ service:
pre:
- name: designate-pool-manager-db-create
dependencies:
- {{ service.database }}
- database
- designate-main-db-create
type: single
command:
mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ designate.db.name.pool_manager }};
mysql -u root -p{{ db.root_password }} -h {{ address('database') }} -e "create database {{ designate.db.name.pool_manager }};
grant all privileges on {{ designate.db.name.pool_manager }}.* to '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
{% if db.tls.enabled %} require ssl {% endif %};"
- name: designate-pool-update

View File

@ -116,7 +116,7 @@ pool_id = {{ designate.pool.pool_id }}
# SQLAlchemy Pool Manager Cache
#------------------------------
[pool_manager_cache:sqlalchemy]
connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.password }}@{{ address(service.database) }}/{{ designate.db.name.pool_manager }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.password }}@{{ address("database") }}/{{ designate.db.name.pool_manager }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
########################
## Storage Configuration
@ -125,7 +125,7 @@ connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.passwor
# SQLAlchemy Storage
#-------------------
[storage:sqlalchemy]
connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.password }}@{{ address(service.database) }}/{{ designate.db.name.main_database }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.password }}@{{ address("database") }}/{{ designate.db.name.main_database }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
########################
## Handler Configuration