openstack
/
openstack-ansible-os_cinder
Code Issues Proposed changes

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
This commit is contained in:
Travis Truman 2016-07-15 17:20:51 -04:00
parent 0cad7a46cf
commit 1333fab730
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -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

6
templates/cinder.conf.j2
View File

@ -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

6
tests/test-vars.yml
View File

@ -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 }}"