From ef55a3436d7bbb78e614232563f650cd9e76b24c Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Fri, 22 Jul 2016 12:04:37 -0700 Subject: [PATCH] Provide default for rabbitmq telemetry password In order to maintain current behavior when deploying ceilometer using the integrated release, default 'glance_rabbitmq_telemetry_password' to 'glance_rabbitmq_password'. 'glance_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: I74fcd572acd029ae991fea8d00f8bb4e0251ccc8 --- defaults/main.yml | 1 + templates/glance-api.conf.j2 | 10 ++++++++-- templates/glance-registry.conf.j2 | 10 ++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index c0489a98..baf9eae3 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -77,6 +77,7 @@ glance_rabbitmq_use_ssl: False ## Configuration for notifications communication, i.e. [oslo_messaging_notifications] glance_rabbitmq_telemetry_userid: "{{ glance_rabbitmq_userid }}" +glance_rabbitmq_telemetry_password: "{{ glance_rabbitmq_password }}" glance_rabbitmq_telemetry_vhost: "{{ glance_rabbitmq_vhost }}" glance_rabbitmq_telemetry_port: "{{ glance_rabbitmq_port }}" glance_rabbitmq_telemetry_servers: "{{ glance_rabbitmq_servers }}" diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index a9772774..2e613eb0 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -24,7 +24,7 @@ enable_v2_api = {{ glance_enable_v2_api }} enable_v2_registry = {{ glance_enable_v2_registry }} rpc_backend = {{ glance_rpc_backend }} -transport_url = rabbit://{% for host in glance_rabbitmq_servers.split(',') %}{{ glance_rabbitmq_userid }}:{{ glance_rabbitmq_password }}@{{ host }}:{{ glance_rabbitmq_port }}/{{ glance_rabbitmq_vhost }}?rabbit_use_ssl={{ glance_rabbitmq_use_ssl }},{% endfor %} +transport_url = rabbit://{% for host in glance_rabbitmq_servers.split(',') %}{{ glance_rabbitmq_userid }}:{{ glance_rabbitmq_password }}@{{ host }}:{{ glance_rabbitmq_port }}/{{ glance_rabbitmq_vhost }}?rabbit_use_ssl={{ glance_rabbitmq_use_ssl }}{% if not loop.last %},{% endif %}{% endfor %} delayed_delete = False scrub_time = 43200 @@ -69,13 +69,19 @@ policy_default_rule = {{ glance_policy_default_rule }} policy_dirs = {{ glance_policy_dirs }} [oslo_messaging_rabbit] +rabbit_hosts = {{ glance_rabbitmq_servers }} +rabbit_port = {{ glance_rabbitmq_port }} +rabbit_userid = {{ glance_rabbitmq_userid }} +rabbit_password = {{ glance_rabbitmq_password }} +rabbit_virtual_host = {{ glance_rabbitmq_vhost }} +rabbit_use_ssl = {{ glance_rabbitmq_use_ssl }} rabbit_notification_exchange = glance rabbit_notification_topic = notifications {% if glance_ceilometer_enabled %} [oslo_messaging_notifications] driver = messagingv2 -transport_url = rabbit://{% for host in glance_rabbitmq_telemetry_servers.split(',') %}{{ glance_rabbitmq_telemetry_userid }}:{{ glance_rabbitmq_telemetry_password }}@{{ host }}:{{ glance_rabbitmq_telemetry_port }}/{{ glance_rabbitmq_telemetry_vhost }}?rabbit_use_ssl={{ glance_rabbitmq_telemetry_use_ssl }},{% endfor %} +transport_url = rabbit://{% for host in glance_rabbitmq_telemetry_servers.split(',') %}{{ glance_rabbitmq_telemetry_userid }}:{{ glance_rabbitmq_telemetry_password }}@{{ host }}:{{ glance_rabbitmq_telemetry_port }}/{{ glance_rabbitmq_telemetry_vhost }}?rabbit_use_ssl={{ glance_rabbitmq_telemetry_use_ssl }}{% if not loop.last %},{% endif %}{% endfor %} {% endif %} [paste_deploy] diff --git a/templates/glance-registry.conf.j2 b/templates/glance-registry.conf.j2 index aaaccbb2..1ec87ebc 100644 --- a/templates/glance-registry.conf.j2 +++ b/templates/glance-registry.conf.j2 @@ -15,7 +15,7 @@ workers = {{ glance_registry_workers | default(api_threads) }} api_limit_max = 1000 limit_param_default = 25 -transport_url = rabbit://{% for host in glance_rabbitmq_servers.split(',') %}{{ glance_rabbitmq_userid }}:{{ glance_rabbitmq_password }}@{{ host }}:{{ glance_rabbitmq_port }}/{{ glance_rabbitmq_vhost }}?rabbit_use_ssl={{ glance_rabbitmq_use_ssl }},{% endfor %} +transport_url = rabbit://{% for host in glance_rabbitmq_servers.split(',') %}{{ glance_rabbitmq_userid }}:{{ glance_rabbitmq_password }}@{{ host }}:{{ glance_rabbitmq_port }}/{{ glance_rabbitmq_vhost }}?rabbit_use_ssl={{ glance_rabbitmq_use_ssl }}{% if not loop.last %},{% endif %}{% endfor %} [database] connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8 @@ -45,13 +45,19 @@ memcache_secret_key = {{ memcached_encryption_key }} check_revocations_for_cached = False [oslo_messaging_rabbit] +rabbit_hosts = {{ glance_rabbitmq_servers }} +rabbit_port = {{ glance_rabbitmq_port }} +rabbit_userid = {{ glance_rabbitmq_userid }} +rabbit_password = {{ glance_rabbitmq_password }} +rabbit_virtual_host = {{ glance_rabbitmq_vhost }} +rabbit_use_ssl = {{ glance_rabbitmq_use_ssl }} rabbit_notification_exchange = glance rabbit_notification_topic = notifications {% if glance_ceilometer_enabled %} [oslo_messaging_notifications] driver = messagingv2 -transport_url = rabbit://{% for host in glance_rabbitmq_telemetry_servers.split(',') %}{{ glance_rabbitmq_telemetry_userid }}:{{ glance_rabbitmq_telemetry_password }}@{{ host }}:{{ glance_rabbitmq_telemetry_port }}/{{ glance_rabbitmq_telemetry_vhost }}?rabbit_use_ssl={{ glance_rabbitmq_telemetry_use_ssl }},{% endfor %} +transport_url = rabbit://{% for host in glance_rabbitmq_telemetry_servers.split(',') %}{{ glance_rabbitmq_telemetry_userid }}:{{ glance_rabbitmq_telemetry_password }}@{{ host }}:{{ glance_rabbitmq_telemetry_port }}/{{ glance_rabbitmq_telemetry_vhost }}?rabbit_use_ssl={{ glance_rabbitmq_telemetry_use_ssl }}{% if not loop.last %},{% endif %}{% endfor %} {% endif %} [oslo_policy]