Fix designate pool manager db and rabbitmq

Add hosts and user/password for rabbitmq and also
add deps on main database creation for pool manager
db create command. And remove duplicate user create for
designate database.

Change-Id: Iacdd2db6368ccc5ad9068fb5fa8fb6cbc8665c2d
This commit is contained in:
Peter Razumovsky 2017-02-21 13:59:34 +04:00
parent 41f9deb816
commit d1bf983141
2 changed files with 10 additions and 3 deletions

View File

@ -8,11 +8,10 @@ service:
- name: designate-pool-manager-db-create
dependencies:
- {{ service.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 }};
create user '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
{% if db.tls.enabled %} require ssl {% endif %};
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-sync

View File

@ -17,6 +17,14 @@ notification_topics = {{ designate.notification.topics.names }}
{{ oslo_messaging[messaging.backend.rpc]('rpc_config') }}
{{ oslo_messaging[messaging.backend.rpc]('notifications_config') }}
rabbit_userid = {{ rabbitmq.user }}
rabbit_password = {{ rabbitmq.password }}
rabbit_hosts = {{ address("rabbitmq", rabbitmq.port) }}
[oslo_messaging_rabbit]
rabbit_userid = {{ rabbitmq.user }}
rabbit_password = {{ rabbitmq.password }}
rabbit_hosts = {{ address("rabbitmq", rabbitmq.port) }}
#--------------------
# Keystone Middleware
@ -89,7 +97,7 @@ threads = {{ designate.service.zone_manager.threads }}
[zone_manager_task:domain_purge]
interval = {{ designate.domain_purge.interval }}
batch_size = {{ designate.domain_purge.batch_size }}
time_threshold = {{ designate.domain_purge.threshold }}
time_threshold = {{ designate.domain_purge.time_threshold }}
#---------------------
# Pool Manager Service