diff --git a/defaults/main.yml b/defaults/main.yml index 2e922e64..afb044fb 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -120,6 +120,7 @@ glance_service_adminurl: "{{ glance_service_adminuri }}" ## Swift Options glance_swift_store_auth_address: "{{ keystone_service_internalurl }}" +glance_swift_store_auth_insecure: "{{ keystone_service_internaluri_insecure }}" glance_swift_store_auth_version: 3 glance_swift_store_user_domain: default glance_swift_store_project_domain: default diff --git a/releasenotes/notes/glance-swift-store-auth-insecure-1b69e1e3e9ba0b30.yaml b/releasenotes/notes/glance-swift-store-auth-insecure-1b69e1e3e9ba0b30.yaml new file mode 100644 index 00000000..e15df877 --- /dev/null +++ b/releasenotes/notes/glance-swift-store-auth-insecure-1b69e1e3e9ba0b30.yaml @@ -0,0 +1,7 @@ +--- +features: + - Set the ``glance_swift_store_auth_insecure`` variable + to override the ``swift_store_auth_inscure`` value in + ``/etc/glance/glance-api.conf``. Set this value when + using an external Swift store that does not have the + same ``insecure`` setting as the local Keystone. diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index ae1a4e19..595e9b4e 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -98,7 +98,7 @@ filesystem_store_datadir = {{ glance_system_user_home }}/images/ {% if 'swift' in glance_available_stores %} swift_store_config_file = /etc/glance/glance-swift-store.conf default_swift_reference = swift1 -swift_store_auth_insecure = {{ keystone_service_internaluri_insecure | bool }} +swift_store_auth_insecure = {{ glance_swift_store_auth_insecure | bool }} swift_store_region = {{ glance_swift_store_region }} swift_store_container = {{ glance_swift_store_container }} swift_store_create_container_on_put = True