@@ -161,6 +161,9 @@ function configure_glance {

     if is_service_enabled s-proxy; then

         iniset $GLANCE_API_CONF glance_store default_store swift

         iniset $GLANCE_API_CONF glance_store swift_store_create_container_on_put True

+        if python3_enabled; then

+            iniset $GLANCE_API_CONF glance_store swift_store_auth_insecure True

+        fi

         iniset $GLANCE_API_CONF glance_store swift_store_config_file $GLANCE_SWIFT_STORE_CONF

         iniset $GLANCE_API_CONF glance_store default_swift_reference ref1

@@ -186,7 +189,13 @@ function configure_glance {

         fi

         iniset $GLANCE_SWIFT_STORE_CONF ref1 key $SERVICE_PASSWORD

-        iniset $GLANCE_SWIFT_STORE_CONF ref1 auth_address $KEYSTONE_SERVICE_URI/v3

+        if python3_enabled; then

+            # NOTE(dims): Currently the glance_store+swift does not support either an insecure flag

+            # or ability to specify the CACERT. So fallback to http:// url

+            iniset $GLANCE_SWIFT_STORE_CONF ref1 auth_address ${KEYSTONE_SERVICE_URI/https/http}/v3

+        else

+            iniset $GLANCE_SWIFT_STORE_CONF ref1 auth_address $KEYSTONE_SERVICE_URI/v3

+        fi

         iniset $GLANCE_SWIFT_STORE_CONF ref1 auth_version 3

         # commenting is not strictly necessary but it's confusing to have bad values in conf

@@ -454,7 +454,6 @@ function configure_swift {

     # out. Make sure we uncomment Tempauth after we uncomment Keystoneauth

     # otherwise, this code also sets the reseller_prefix for Keystoneauth.

     iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth account_autocreate

-    iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth reseller_prefix

     iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth reseller_prefix "TEMPAUTH"

     if is_service_enabled swift3; then