diff --git a/defaults/main.yml b/defaults/main.yml index 5143712..0b9711f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -58,6 +58,9 @@ designate_pool_manager_galera_database: designate_pool_manager ## RabbitMQ info designate_rabbitmq_userid: designate designate_rabbitmq_vhost: /designate +designate_rabbitmq_servers: 127.0.0.1 +designate_rabbitmq_use_ssl: False +designate_rabbitmq_port: 5672 ## Pool Configuration Defaults # These are typically set in the user_secrets.yml file. diff --git a/templates/designate.conf.j2 b/templates/designate.conf.j2 index c4012dc..6e8e9fe 100644 --- a/templates/designate.conf.j2 +++ b/templates/designate.conf.j2 @@ -29,12 +29,12 @@ root_helper = sudo designate-rootwrap /etc/designate/rootwrap.conf # RabbitMQ Config [oslo_messaging_rabbit] rpc_backend = rabbit -rabbit_port = {{ rabbitmq_port }} +rabbit_port = {{ designate_rabbitmq_port }} rabbit_userid = {{ designate_rabbitmq_userid }} rabbit_password = {{ designate_rabbitmq_password }} rabbit_virtual_host = {{ designate_rabbitmq_vhost }} -rabbit_hosts = {{ rabbitmq_servers }} -rabbit_use_ssl = {{ rabbitmq_use_ssl }} +rabbit_hosts = {{ designate_rabbitmq_servers }} +rabbit_use_ssl = {{ designate_rabbitmq_use_ssl }} rabbit_notification_exchange = designate rabbit_notification_topic = notifications diff --git a/tests/test-vars.yml b/tests/test-vars.yml index 331d9a3..fa2706d 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -68,6 +68,9 @@ designate_pool_manager_container_mysql_password: "SuperSecrete" designate_rabbitmq_password: "secrete" designate_rabbitmq_userid: 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" tempest_developer_mode: True tempest_git_install_branch: master