Fix bug in RPC config that broke Rabbit SSL support
The use_rabbit_ssl query parameter is not respected by oslo.messaging's rabbit driver, only the pika driver supports configuration using query parameters at present. Change-Id: Ib3ee5b409dbc2fc2dc8d25990d4962ec49e21131 Implements: blueprint multi-rabbitmq-clusters
This commit is contained in:
parent
39ee391e9d
commit
3bc9562fb9
@ -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 }}{% if not loop.last %},{% endif %}{% endfor %}
|
||||
transport_url = rabbit://{% for host in glance_rabbitmq_servers.split(',') %}{{ glance_rabbitmq_userid }}:{{ glance_rabbitmq_password }}@{{ host }}:{{ glance_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ glance_rabbitmq_vhost }}{% endif %}{% endfor %}
|
||||
|
||||
delayed_delete = False
|
||||
scrub_time = 43200
|
||||
@ -70,11 +70,6 @@ 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
|
||||
@ -82,7 +77,7 @@ 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 }}{% if not loop.last %},{% endif %}{% 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 }}{% if not loop.last %},{% else %}/{{ glance_rabbitmq_telemetry_vhost }}{% endif %}{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
[paste_deploy]
|
||||
|
@ -15,7 +15,8 @@ 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 }}{% if not loop.last %},{% endif %}{% endfor %}
|
||||
transport_url = rabbit://{% for host in glance_rabbitmq_servers.split(',') %}{{ glance_rabbitmq_userid }}:{{ glance_rabbitmq_password }}@{{ host }}:{{ glance_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ glance_rabbitmq_vhost }}{% endif %}{% endfor %}
|
||||
|
||||
|
||||
[database]
|
||||
connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8
|
||||
@ -46,11 +47,6 @@ 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
|
||||
@ -58,7 +54,7 @@ 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 }}{% if not loop.last %},{% endif %}{% 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 }}{% if not loop.last %},{% else %}/{{ glance_rabbitmq_telemetry_vhost }}{% endif %}{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
[oslo_policy]
|
||||
|
Loading…
x
Reference in New Issue
Block a user