From b69110a3003355d9e71131216b6627654d13c8f2 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 28 Jan 2021 19:10:32 +0200 Subject: [PATCH] Cleanup glance variables Remove deprecated config options that no longer have effect. We also set cinder_catalog_info to valid default. Change-Id: Ic24f9a912fc0e7ef73e4e8de4a8440fbf5ddac17 --- templates/glance-api.conf.j2 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index 2b4552d4..918d810f 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -12,14 +12,12 @@ http_keepalive = {{ glance_http_keepalive }} digest_algorithm = {{ glance_digest_algorithm }} backlog = 4096 workers = {{ glance_api_workers | default(glance_api_threads) }} -cinder_catalog_info = volume:cinder:internalURL -enable_image_import = {{ not glance_use_uwsgi | bool }} +cinder_catalog_info = volumev3:cinderv3:internalURL enable_v2_api = {{ glance_enable_v2_api | bool }} transport_url = {{ glance_oslomsg_rpc_transport }}://{% for host in glance_oslomsg_rpc_servers.split(',') %}{{ glance_oslomsg_rpc_userid }}:{{ glance_oslomsg_rpc_password }}@{{ host }}:{{ glance_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ glance_oslomsg_rpc_vhost }}{% if glance_oslomsg_rpc_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} -delayed_delete = False scrub_time = 43200 image_cache_dir = {{ glance_system_user_home }}/cache/ @@ -67,10 +65,9 @@ policy_dirs = {{ glance_policy_dirs }} [oslo_messaging_rabbit] ssl = {{ glance_oslomsg_notify_use_ssl | bool }} -rabbit_notification_exchange = glance -rabbit_notification_topic = notifications [oslo_messaging_notifications] +topics = notifications driver = {{ (glance_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }} transport_url = {{ glance_oslomsg_notify_transport }}://{% for host in glance_oslomsg_notify_servers.split(',') %}{{ glance_oslomsg_notify_userid }}:{{ glance_oslomsg_notify_password }}@{{ host }}:{{ glance_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ glance_oslomsg_notify_vhost }}{% if glance_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}