From 1333fab73092e0c5014ff2a6a7bd574809d320d7 Mon Sep 17 00:00:00 2001 From: Travis Truman Date: Fri, 15 Jul 2016 17:20:51 -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: I4caa7b394dcf95bbf7aab621d92efc65d87e2c3f Implements: blueprint multi-rabbitmq-clusters --- defaults/main.yml | 3 +++ templates/cinder.conf.j2 | 6 +++--- tests/test-vars.yml | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index a7e1dbd4..53ffa54c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -49,6 +49,9 @@ cinder_galera_database: cinder ## RabbitMQ info cinder_rabbitmq_userid: cinder cinder_rabbitmq_vhost: /cinder +cinder_rabbitmq_port: 5672 +cinder_rabbitmq_servers: 127.0.0.1 +cinder_rabbitmq_use_ssl: False ## Cinder User / Group cinder_system_user_name: cinder diff --git a/templates/cinder.conf.j2 b/templates/cinder.conf.j2 index 40bd5bde..4e919df9 100644 --- a/templates/cinder.conf.j2 +++ b/templates/cinder.conf.j2 @@ -110,12 +110,12 @@ nfs_shares_config={{ cinder_nfs_client.nfs_shares_config }} connection = mysql+pymysql://{{ cinder_galera_user }}:{{ cinder_container_mysql_password }}@{{ cinder_galera_address }}/{{ cinder_galera_database }}?charset=utf8 [oslo_messaging_rabbit] -rabbit_port = {{ rabbitmq_port }} +rabbit_port = {{ cinder_rabbitmq_port }} rabbit_userid = {{ cinder_rabbitmq_userid }} rabbit_password = {{ cinder_rabbitmq_password }} rabbit_virtual_host = {{ cinder_rabbitmq_vhost }} -rabbit_hosts = {{ rabbitmq_servers }} -rabbit_use_ssl = {{ rabbitmq_use_ssl }} +rabbit_hosts = {{ cinder_rabbitmq_servers }} +rabbit_use_ssl = {{ cinder_rabbitmq_use_ssl }} [oslo_concurrency] lock_path = /var/lock/cinder diff --git a/tests/test-vars.yml b/tests/test-vars.yml index c3fbbfd0..82183053 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -9,6 +9,9 @@ cinder_galera_address: 10.100.100.2 cinder_git_install_branch: master cinder_glance_api_servers: "http://glance_server:9292" cinder_profiler_hmac_key: "secrete" +cinder_rabbitmq_port: 5671 +cinder_rabbitmq_servers: 10.100.100.2 +cinder_rabbitmq_use_ssl: true cinder_rabbitmq_password: "secrete" cinder_rabbitmq_userid: cinder cinder_rabbitmq_vhost: /cinder @@ -51,9 +54,6 @@ memcached_servers: 127.0.0.1 openrc_os_auth_url: "{{ keystone_service_internalurl }}" 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 tempest_developer_mode: True tempest_git_install_branch: master tempest_venv_tag: "{{ tempest_git_install_branch }}"