openstack
/
openstack-ansible-os_sahara
Code Issues Proposed changes

Support service-specific rabbitmq clusters 

This chage adds support for service-specific rabbitmq clusters
for the sahara role.

Change-Id: I3df61ca5d8813d5b6301fcd51e2ddacd8e67253f
This commit is contained in:
Flavio Ramalho 2016-08-26 16:14:55 +00:00
parent 2dbb5c1727
commit 97e66f2491
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
defaults/main.yml
View File

@ -50,15 +50,22 @@ sahara_system_comment: sahara system user
sahara_system_user_home: "/var/lib/{{ sahara_system_user_name }}"
sahara_engine_host: "{{ internal_lb_vip_address }}"
sahara_rpc_backend: sahara.openstack.common.rpc.impl_kombu
## RabbitMQ info
sahara_rpc_backend: sahara.openstack.common.rpc.impl_kombu
sahara_rabbitmq_userid: sahara
sahara_rabbitmq_vhost: /sahara
sahara_rabbitmq_use_ssl: False
sahara_rabbitmq_servers: 127.0.0.1
sahara_rabbitmq_port: 5672
## Configuration for notifications communication, i.e. [oslo_messaging_notifications]
sahara_rabbitmq_telemetry_userid: "{{ sahara_rabbitmq_userid }}"
sahara_rabbitmq_telemetry_vhost: "{{ sahara_rabbitmq_vhost }}"
sahara_rabbitmq_telemetry_port: "{{ sahara_rabbitmq_port }}"
sahara_rabbitmq_telemetry_servers: "{{ sahara_rabbitmq_servers }}"
sahara_rabbitmq_telemetry_use_ssl: "{{ sahara_rabbitmq_use_ssl }}"
## DB info
sahara_galera_database: sahara
sahara_galera_user: sahara

16
templates/sahara.conf.j2
View File

@ -27,6 +27,11 @@ proxy_user_domain_name = {{ sahara_proxy_user_domain_name }}
proxy_user_role_names = {{ sahara_proxy_user_role_names }}
{% endif %}
## RPC Backend
rpc_backend = {{ sahara_rpc_backend }}
transport_url = rabbit://{% for host in sahara_rabbitmq_servers.split(',') %}{{ sahara_rabbitmq_userid }}:{{ sahara_rabbitmq_password }}@{{ host }}:{{ sahara_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ sahara_rabbitmq_vhost }}{% endif %}{% endfor %}
[database]
connection = mysql+pymysql://{{ sahara_galera_user }}:{{ sahara_container_mysql_password }}@{{ sahara_galera_address }}/{{ sahara_galera_database }}?charset=utf8
@ -66,21 +71,16 @@ policy_file = {{ sahara_policy_file }}
policy_default_rule = {{ sahara_policy_default_rule }}
policy_dirs = {{ sahara_policy_dirs }}
# Ceilometer options
{% if sahara_ceilometer_enabled %}
[oslo_messaging_notifications]
driver = messagingv2
transport_url = rabbit://{% for host in sahara_rabbitmq_telemetry_servers.split(',') %}{{ sahara_rabbitmq_telemetry_userid }}:{{ sahara_rabbitmq_telemetry_password }}@{{ host }}:{{ sahara_rabbitmq_telemetry_port }}{% if not loop.last %},{% else %}/{{ sahara_rabbitmq_telemetry_vhost }}{% endif %}{% endfor %}
{% endif %}
[oslo_messaging_rabbit]
rabbit_hosts = {{ sahara_rabbitmq_servers }}
rabbit_port = {{ sahara_rabbitmq_port }}
rabbit_userid = {{ sahara_rabbitmq_userid }}
rabbit_password = {{ sahara_rabbitmq_password }}
rabbit_virtual_host = {{ sahara_rabbitmq_vhost }}
rabbit_use_ssl = {{ sahara_rabbitmq_use_ssl }}
rabbit_notification_exchange = sahara
rabbit_notification_topic = notifications
rabbit_use_ssl = {{ rabbitmq_use_ssl }}
[profiler]
enabled = {{ sahara_profiler_enabled }}