openstack/openstack-ansible-os_keystone
Code Issues Proposed changes

Provide default for rabbitmq telemetry password

Browse Source 
In order to maintain current behavior when deploying ceilometer using
the integrated release, default 'keystone_rabbitmq_telemetry_password'
to 'keystone_rabbitmq_password'. 'keystone_rabbitmq_telemetry_*' vars
may be provided by the user as overrides if a separate rabbitmq cluster
is being used for telemetry.

Also update the configured transport_urls to only include a comma
between urls and re-add rabbit configuration information to the
oslo_messaging_rabbit block.

Change-Id: I310dd2397fdee97790be5e5488a6461b8699ecf4
This commit is contained in:
Jimmy McCrory 2016-07-22 12:04:47 -07:00
parent 7bc36b8b4f
commit 61848d3de2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -104,6 +104,7 @@ keystone_rabbitmq_use_ssl: false
## Configuration for notifications communication, i.e. [oslo_messaging_notifications] ## Configuration for notifications communication, i.e. [oslo_messaging_notifications]
keystone_rabbitmq_telemetry_userid: "{{ keystone_rabbitmq_userid }}" keystone_rabbitmq_telemetry_userid: "{{ keystone_rabbitmq_userid }}"
keystone_rabbitmq_telemetry_password: "{{ keystone_rabbitmq_password }}"
keystone_rabbitmq_telemetry_vhost: "{{ keystone_rabbitmq_vhost }}" keystone_rabbitmq_telemetry_vhost: "{{ keystone_rabbitmq_vhost }}"
keystone_rabbitmq_telemetry_port: "{{ keystone_rabbitmq_port }}" keystone_rabbitmq_telemetry_port: "{{ keystone_rabbitmq_port }}"
keystone_rabbitmq_telemetry_servers: "{{ keystone_rabbitmq_servers }}" keystone_rabbitmq_telemetry_servers: "{{ keystone_rabbitmq_servers }}"

10
templates/keystone.conf.j2
View File

@ -19,15 +19,21 @@ log_dir = /var/log/keystone
## RabbitMQ RPC ## RabbitMQ RPC
{% if keystone_messaging_enabled | bool %} {% if keystone_messaging_enabled | bool %}
rpc_backend = {{ keystone_rpc_backend }} rpc_backend = {{ keystone_rpc_backend }}
transport_url = rabbit://{% for host in keystone_rabbitmq_servers.split(',') %}{{ keystone_rabbitmq_userid }}:{{ keystone_rabbitmq_password }}@{{ host }}:{{ keystone_rabbitmq_port }}/{{ keystone_rabbitmq_vhost }}?rabbit_use_ssl={{ keystone_rabbitmq_use_ssl }},{% endfor %} transport_url = rabbit://{% for host in keystone_rabbitmq_servers.split(',') %}{{ keystone_rabbitmq_userid }}:{{ keystone_rabbitmq_password }}@{{ host }}:{{ keystone_rabbitmq_port }}/{{ keystone_rabbitmq_vhost }}?rabbit_use_ssl={{ keystone_rabbitmq_use_ssl }}{% if not loop.last %},{% endif %}{% endfor %}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
rabbit_port = {{ keystone_rabbitmq_port }}
rabbit_userid = {{ keystone_rabbitmq_userid }}
rabbit_password = {{ keystone_rabbitmq_password }}
rabbit_virtual_host = {{ keystone_rabbitmq_vhost }}
rabbit_hosts = {{ keystone_rabbitmq_servers }}
rabbit_use_ssl = {{ keystone_rabbitmq_use_ssl }}
{% endif %} {% endif %}
{% if keystone_ceilometer_enabled %} {% if keystone_ceilometer_enabled %}
[oslo_messaging_notifications] [oslo_messaging_notifications]
driver = messagingv2 driver = messagingv2
transport_url = rabbit://{% for host in keystone_rabbitmq_telemetry_servers.split(',') %}{{ keystone_rabbitmq_telemetry_userid }}:{{ keystone_rabbitmq_telemetry_password }}@{{ host }}:{{ keystone_rabbitmq_telemetry_port }}/{{ keystone_rabbitmq_telemetry_vhost }}?rabbit_use_ssl={{ keystone_rabbitmq_telemetry_use_ssl }},{% endfor %} transport_url = rabbit://{% for host in keystone_rabbitmq_telemetry_servers.split(',') %}{{ keystone_rabbitmq_telemetry_userid }}:{{ keystone_rabbitmq_telemetry_password }}@{{ host }}:{{ keystone_rabbitmq_telemetry_port }}/{{ keystone_rabbitmq_telemetry_vhost }}?rabbit_use_ssl={{ keystone_rabbitmq_telemetry_use_ssl }}{% if not loop.last %},{% endif %}{% endfor %}
{% endif %} {% endif %}
{% if 'memcache' in keystone_token_driver and 'fernet' not in keystone_token_provider %} {% if 'memcache' in keystone_token_driver and 'fernet' not in keystone_token_provider %}