Browse code

Merge "Configure glance swift communication with v3"

Jenkins authored on 2015/08/14 16:24:47
Showing 1 changed files
... ...
@@ -154,7 +154,10 @@ function configure_glance {
154 154
 
155 155
         iniset $GLANCE_SWIFT_STORE_CONF ref1 user $SERVICE_TENANT_NAME:glance-swift
156 156
         iniset $GLANCE_SWIFT_STORE_CONF ref1 key $SERVICE_PASSWORD
157
-        iniset $GLANCE_SWIFT_STORE_CONF ref1 auth_address $KEYSTONE_SERVICE_URI/v2.0/
157
+        iniset $GLANCE_SWIFT_STORE_CONF ref1 auth_address $KEYSTONE_SERVICE_URI/v3
158
+        iniset $GLANCE_SWIFT_STORE_CONF ref1 user_domain_id default
159
+        iniset $GLANCE_SWIFT_STORE_CONF ref1 project_domain_id default
160
+        iniset $GLANCE_SWIFT_STORE_CONF ref1 auth_version 3
158 161
 
159 162
         # commenting is not strictly necessary but it's confusing to have bad values in conf
160 163
         inicomment $GLANCE_API_CONF glance_store swift_store_user