openstack
/
openstack-ansible-os_cinder
Code Issues Proposed changes

Allow configuration of multiple rabbit clusters 

Introduced new variables so the transport_url values
used for RPC and notifications can vary. By default
they will remain the same.

Change-Id: Ia2f906af5d98c98ffcdbc07ab88ee7b0993eeb8c
Implements: blueprint multi-rabbitmq-clusters
This commit is contained in:
Travis Truman 2016-07-20 16:11:45 -04:00
parent eaac07c507
commit 230a0d6804
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
defaults/main.yml
View File

@ -47,12 +47,21 @@ cinder_galera_user: cinder
cinder_galera_database: cinder
## RabbitMQ info
## Configuration for RPC communications
cinder_rabbitmq_userid: cinder
cinder_rabbitmq_vhost: /cinder
cinder_rabbitmq_port: 5672
cinder_rabbitmq_servers: 127.0.0.1
cinder_rabbitmq_use_ssl: False
## Configuration for notifications communication, i.e. [oslo_messaging_notifications]
cinder_rabbitmq_telemetry_userid: "{{ cinder_rabbitmq_userid }}"
cinder_rabbitmq_telemetry_vhost: "{{ cinder_rabbitmq_vhost }}"
cinder_rabbitmq_telemetry_port: "{{ cinder_rabbitmq_port }}"
cinder_rabbitmq_telemetry_servers: "{{ cinder_rabbitmq_servers }}"
cinder_rabbitmq_telemetry_use_ssl: "{{ cinder_rabbitmq_use_ssl }}"
## Cinder User / Group
cinder_system_user_name: cinder
cinder_system_group_name: cinder

20
templates/cinder.conf.j2
View File

@ -45,8 +45,9 @@ backup_ceph_pool = {{ cinder_service_backup_ceph_pool }}
{% endif %}
{% endif %}
## RabbitMQ
## RabbitMQ RPC
rpc_backend = {{ cinder_rpc_backend }}
transport_url = rabbit://{% for host in cinder_rabbitmq_servers.split(',') %}{{ cinder_rabbitmq_userid }}:{{ cinder_rabbitmq_password }}@{{ host }}:{{ cinder_rabbitmq_port }}/{{ cinder_rabbitmq_vhost }}?rabbit_use_ssl={{ cinder_rabbitmq_use_ssl }},{% endfor %}
## Quota
quota_volumes = {{ cinder_quota_volumes }}
@ -88,11 +89,6 @@ default_volume_type = {{ cinder_default_volume_type }}
{% if cinder_backends is defined %}
enabled_backends={% for backend in cinder_backends|dictsort %}{{ backend.0 }}{% if not loop.last %},{% endif %}{% endfor %}
{% if cinder_ceilometer_enabled %}
[oslo_messaging_notifications]
driver = messagingv2
{% endif %}
# All given backend(s)
{% for backend_section in cinder_backends|dictsort %}
[{{ backend_section.0 }}]
@ -110,12 +106,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 = {{ cinder_rabbitmq_port }}
rabbit_userid = {{ cinder_rabbitmq_userid }}
rabbit_password = {{ cinder_rabbitmq_password }}
rabbit_virtual_host = {{ cinder_rabbitmq_vhost }}
rabbit_hosts = {{ cinder_rabbitmq_servers }}
rabbit_use_ssl = {{ cinder_rabbitmq_use_ssl }}
{% if cinder_ceilometer_enabled %}
[oslo_messaging_notifications]
driver = messagingv2
transport_url = rabbit://{% for host in cinder_rabbitmq_telemetry_servers.split(',') %}{{ cinder_rabbitmq_telemetry_userid }}:{{ cinder_rabbitmq_telemetry_password }}@{{ host }}:{{ cinder_rabbitmq_telemetry_port }}/{{ cinder_rabbitmq_telemetry_vhost }}?rabbit_use_ssl={{ cinder_rabbitmq_telemetry_use_ssl }},{% endfor %}
{% endif %}
[oslo_concurrency]
lock_path = /var/lock/cinder

8
tests/test-vars.yml
View File

@ -9,9 +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_port: 5672
cinder_rabbitmq_servers: 10.100.100.2
cinder_rabbitmq_use_ssl: true
cinder_rabbitmq_use_ssl: False
cinder_rabbitmq_password: "secrete"
cinder_rabbitmq_userid: cinder
cinder_rabbitmq_vhost: /cinder
@ -35,9 +35,9 @@ keystone_galera_address: 10.100.100.2
keystone_galera_database: keystone
keystone_git_install_branch: master
keystone_rabbitmq_password: "secrete"
keystone_rabbitmq_port: 5671
keystone_rabbitmq_port: 5672
keystone_rabbitmq_servers: 10.100.100.2
keystone_rabbitmq_use_ssl: false
keystone_rabbitmq_use_ssl: False
keystone_rabbitmq_userid: keystone
keystone_rabbitmq_vhost: /keystone
keystone_requirements_git_install_branch: master