openstack/openstack-ansible-os_designate
Code Issues Proposed changes

Merge "Support service-specific rabbitmq clusters"

Browse Source
This commit is contained in:
Jenkins
2016-07-22 21:53:57 +00:00
committed by Gerrit Code Review
parent 33e47f76b0 311af8a571
commit 0e8ba62e2f
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@@ -58,6 +58,9 @@ designate_pool_manager_galera_database: designate_pool_manager
## RabbitMQ info ## RabbitMQ info
designate_rabbitmq_userid: designate designate_rabbitmq_userid: designate
designate_rabbitmq_vhost: /designate designate_rabbitmq_vhost: /designate
designate_rabbitmq_servers: 127.0.0.1
designate_rabbitmq_use_ssl: False
designate_rabbitmq_port: 5672
## Pool Configuration Defaults ## Pool Configuration Defaults
# These are typically set in the user_secrets.yml file. # These are typically set in the user_secrets.yml file.

6
templates/designate.conf.j2
View File

@@ -29,12 +29,12 @@ root_helper = sudo designate-rootwrap /etc/designate/rootwrap.conf
# RabbitMQ Config # RabbitMQ Config
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
rpc_backend = rabbit rpc_backend = rabbit
rabbit_port = {{ rabbitmq_port }} rabbit_port = {{ designate_rabbitmq_port }}
rabbit_userid = {{ designate_rabbitmq_userid }} rabbit_userid = {{ designate_rabbitmq_userid }}
rabbit_password = {{ designate_rabbitmq_password }} rabbit_password = {{ designate_rabbitmq_password }}
rabbit_virtual_host = {{ designate_rabbitmq_vhost }} rabbit_virtual_host = {{ designate_rabbitmq_vhost }}
rabbit_hosts = {{ rabbitmq_servers }} rabbit_hosts = {{ designate_rabbitmq_servers }}
rabbit_use_ssl = {{ rabbitmq_use_ssl }} rabbit_use_ssl = {{ designate_rabbitmq_use_ssl }}
rabbit_notification_exchange = designate rabbit_notification_exchange = designate
rabbit_notification_topic = notifications rabbit_notification_topic = notifications

3
tests/test-vars.yml
View File

@@ -68,6 +68,9 @@ designate_pool_manager_container_mysql_password: "SuperSecrete"
designate_rabbitmq_password: "secrete" designate_rabbitmq_password: "secrete"
designate_rabbitmq_userid: designate designate_rabbitmq_userid: designate
designate_rabbitmq_vhost: /designate designate_rabbitmq_vhost: /designate
designate_rabbitmq_servers: "{{ rabbitmq_servers }}"
designate_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
designate_rabbitmq_port: "{{ rabbitmq_port }}"
designate_bin: "/openstack/venvs/designate-{{ designate_venv_tag }}/bin" designate_bin: "/openstack/venvs/designate-{{ designate_venv_tag }}/bin"
tempest_developer_mode: True tempest_developer_mode: True
tempest_git_install_branch: master tempest_git_install_branch: master