From 2ad00bc64356a6715a5f4db1fe2a95ad31113d7f Mon Sep 17 00:00:00 2001 From: Travis Truman Date: Fri, 15 Jul 2016 17:23:43 -0400 Subject: [PATCH] Support service-specific rabbitmq clusters All rabbitmq connection vars are now namespaced. Namespace support was previously inconsistent which limited deployer override options. Change-Id: I363c46ba93215f46335034a842849f493c3997a2 Implements: blueprint multi-rabbitmq-clusters --- defaults/main.yml | 4 +++- templates/glance-api.conf.j2 | 6 +++--- templates/glance-registry.conf.j2 | 6 +++--- tests/test-vars.yml | 8 ++++---- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index dd4c3eba..1d33338e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -69,7 +69,9 @@ glance_enable_v2_registry: True ## RabbitMQ info glance_rabbitmq_userid: glance glance_rabbitmq_vhost: /glance - +glance_rabbitmq_port: 5672 +glance_rabbitmq_servers: 127.0.0.1 +glance_rabbitmq_use_ssl: False ## DB info glance_galera_database: glance glance_galera_user: glance diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index f62e8735..5a140778 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -73,12 +73,12 @@ policy_default_rule = {{ glance_policy_default_rule }} policy_dirs = {{ glance_policy_dirs }} [oslo_messaging_rabbit] -rabbit_hosts = {{ rabbitmq_servers }} -rabbit_port = {{ rabbitmq_port }} +rabbit_hosts = {{ glance_rabbitmq_servers }} +rabbit_port = {{ glance_rabbitmq_port }} rabbit_userid = {{ glance_rabbitmq_userid }} rabbit_password = {{ glance_rabbitmq_password }} rabbit_virtual_host = {{ glance_rabbitmq_vhost }} -rabbit_use_ssl = {{ rabbitmq_use_ssl }} +rabbit_use_ssl = {{ glance_rabbitmq_use_ssl }} rabbit_notification_exchange = glance rabbit_notification_topic = notifications diff --git a/templates/glance-registry.conf.j2 b/templates/glance-registry.conf.j2 index 30b0790c..2932b907 100644 --- a/templates/glance-registry.conf.j2 +++ b/templates/glance-registry.conf.j2 @@ -49,12 +49,12 @@ memcache_secret_key = {{ memcached_encryption_key }} check_revocations_for_cached = False [oslo_messaging_rabbit] -rabbit_hosts = {{ rabbitmq_servers }} -rabbit_port = {{ rabbitmq_port }} +rabbit_hosts = {{ glance_rabbitmq_servers }} +rabbit_port = {{ glance_rabbitmq_port }} rabbit_userid = {{ glance_rabbitmq_userid }} rabbit_password = {{ glance_rabbitmq_password }} rabbit_virtual_host = {{ glance_rabbitmq_vhost }} -rabbit_use_ssl = {{ rabbitmq_use_ssl }} +rabbit_use_ssl = {{ glance_rabbitmq_use_ssl }} rabbit_notification_exchange = glance rabbit_notification_topic = notifications diff --git a/tests/test-vars.yml b/tests/test-vars.yml index 3c2b797e..a9194774 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -22,6 +22,9 @@ glance_galera_address: 10.100.100.2 glance_galera_database: glance glance_git_install_branch: master glance_profiler_hmac_key: "secrete" +glance_rabbitmq_port: 5671 +glance_rabbitmq_servers: 10.100.100.2 +glance_rabbitmq_use_ssl: true glance_rabbitmq_password: "secrete" glance_rabbitmq_userid: glance glance_rabbitmq_vhost: /glance @@ -56,7 +59,4 @@ memcached_encryption_key: "secrete" memcached_servers: 127.0.0.1 openrc_os_auth_url: "http://127.0.0.1:5000/v3" openrc_os_domain_name: "Default" -openrc_os_password: "{{ keystone_auth_admin_password }}" -rabbitmq_port: 5671 -rabbitmq_servers: 10.100.100.2 -rabbitmq_use_ssl: true +openrc_os_password: "{{ keystone_auth_admin_password }}" \ No newline at end of file