From e4acad2bb660d2776bc86e30e7791f9f9adb5c4e Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 15 Nov 2023 16:08:50 +0100 Subject: [PATCH] Fix cinder store configuration According to configuration guide of using cinder as a storage [1], some auth data should be provided in storage section. It also needs show_multiple_locations to be enabled. [1] https://docs.openstack.org/cinder/latest/admin/volume-backed-image.html Change-Id: Iacd5b74cbda1fdf48a073dc17b42caa37c2359e5 --- defaults/main.yml | 2 +- templates/glance-api.conf.j2 | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 34805b38..8608a29b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -97,7 +97,7 @@ glance_available_store_types: "{{ glance_available_stores | map(attribute='type' glance_flavor: "{% if 'rbd' in glance_available_store_types %}keystone{% else %}keystone+cachemanagement{% endif %}" glance_show_image_direct_url: "{{ 'rbd' in glance_available_store_types }}" -glance_show_multiple_locations: "{{ 'rbd' in glance_available_store_types }}" +glance_show_multiple_locations: "{{ 'rbd' in glance_available_store_types or 'cinder' in glance_available_store_types }}" glance_memcached_servers: "{{ memcached_servers }}" diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index cdbdff3c..609a6dce 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -12,7 +12,6 @@ http_keepalive = {{ glance_http_keepalive }} digest_algorithm = {{ glance_digest_algorithm }} backlog = 4096 workers = {{ glance_api_workers | default(glance_api_threads) }} -cinder_catalog_info = volumev3:cinderv3:internalURL enable_v2_api = {{ glance_enable_v2_api | bool }} @@ -113,6 +112,16 @@ rbd_store_user = {{ glance_rbd_store_user }} rbd_store_ceph_conf = /etc/ceph/ceph.conf rbd_store_chunk_size = {{ glance_rbd_store_chunk_size }} +{% elif backend['name'] == 'cinder' and backend['type'] == 'cinder' and 'config' not in backend %} +[cinder] +cinder_catalog_info = volumev3:cinderv3:internalURL +cinder_store_auth_address = {{ keystone_service_adminurl }} +cinder_store_user_name = {{ glance_service_user_name }} +cinder_store_password = {{ glance_service_password }} +cinder_store_project_name = {{ glance_service_project_name }} +cinder_store_user_domain_name = {{ glance_service_user_domain_id }} +cinder_store_project_domain_name = {{ glance_service_project_domain_id }} + {% else %} [{{ backend['name'] }}] {% for key, value in backend.get('config', {}) %}