openstack
/
openstack-ansible-os_sahara
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: Ife9a394be5c21c85353966cf82e69a8ff3a13204
Implements: blueprint multi-rabbitmq-clusters
This commit is contained in:
Travis Truman 2016-07-15 17:33:26 -04:00
parent 3cbabaf792
commit 1480e3ac0e
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
defaults/main.yml
View File

@ -26,7 +26,7 @@ sahara_developer_constraints:
sahara_venv_tag: untagged
sahara_bin: "/openstack/venvs/sahara-{{ sahara_venv_tag }}/bin"
sahara_etc_dir: "{{ sahara_bin | dirname }}/etc/sahara"
sahara_etc_dir: "{{ sahara_bin | dirname }}/etc/sahara"
sahara_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/sahara.tgz
@ -51,6 +51,8 @@ sahara_rpc_backend: sahara.openstack.common.rpc.impl_kombu
## RabbitMQ info
sahara_rabbitmq_userid: sahara
sahara_rabbitmq_vhost: /sahara
sahara_rabbitmq_use_ssl: False
sahara_rabbitmq_port: 5672
## DB info
sahara_galera_database: sahara
@ -65,7 +67,7 @@ sahara_engine_program_name: sahara-engine
## Service Type and Data
sahara_service_region: RegionOne
sahara_service_name: sahara
sahara_service_port: 8386
sahara_service_port: 8386
sahara_service_proto: http
sahara_service_engine_proto: "{{ sahara_service_proto }}"
sahara_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(sahara_service_proto) }}"
@ -95,7 +97,7 @@ sahara_global_remote_threshold: 100
sahara_cluster_remote_threshold: 70
sahara_os_region_name: "{{ sahara_service_region }}"
sahara_default_ntp_server: "pool.ntp.org"
sahara_use_domain_for_proxy_users: True
sahara_proxy_user_domain_name: sahara_proxy
sahara_proxy_user_role_names: _member_

6
templates/sahara.conf.j2
View File

@ -70,12 +70,12 @@ driver = messagingv2
[oslo_messaging_rabbit]
rabbit_hosts = {{ rabbitmq_servers }}
rabbit_port = {{ rabbitmq_port }}
rabbit_hosts = {{ sahararabbitmq_servers }}
rabbit_port = {{ sahararabbitmq_port }}
rabbit_userid = {{ sahara_rabbitmq_userid }}
rabbit_password = {{ sahara_rabbitmq_password }}
rabbit_virtual_host = {{ sahara_rabbitmq_vhost }}
rabbit_use_ssl = {{ rabbitmq_use_ssl }}
rabbit_use_ssl = {{ sahara_rabbitmq_use_ssl }}
rabbit_notification_exchange = sahara
rabbit_notification_topic = notifications

1
tests/test-vars.yml
View File

@ -99,6 +99,7 @@ sahara_galera_address: 10.100.100.2
sahara_galera_database: sahara
sahara_galera_user: sahara
sahara_container_mysql_password: "SuperSecrete"
sahara_rabbitmq_servers: 10.100.100.2
sahara_rabbitmq_password: "secrete"
sahara_rabbitmq_userid: sahara
sahara_rabbitmq_vhost: /sahara