Browse code

Merge "Remove default value for Cinder Auth Strategy"

Zuul authored on 2018/03/14 01:35:13
Showing 1 changed files
... ...
@@ -227,7 +227,6 @@ function configure_cinder {
227 227
 
228 228
     configure_auth_token_middleware $CINDER_CONF cinder $CINDER_AUTH_CACHE_DIR
229 229
 
230
-    iniset $CINDER_CONF DEFAULT auth_strategy keystone
231 230
     iniset $CINDER_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
232 231
 
233 232
     iniset $CINDER_CONF DEFAULT target_helper "$CINDER_ISCSI_HELPER"
... ...
@@ -541,7 +540,17 @@ function create_volume_types {
541 541
         local be be_name
542 542
         for be in ${CINDER_ENABLED_BACKENDS//,/ }; do
543 543
             be_name=${be##*:}
544
-            openstack --os-region-name="$REGION_NAME" volume type create --property volume_backend_name="${be_name}" ${be_name}
544
+            # NOTE (e0ne): openstack client doesn't work with cinder in noauth mode
545
+            if is_service_enabled keystone; then
546
+                openstack --os-region-name="$REGION_NAME" volume type create --property volume_backend_name="${be_name}" ${be_name}
547
+            else
548
+                # TODO (e0ne): use openstack client once it will support cinder in noauth mode:
549
+                # https://bugs.launchpad.net/python-cinderclient/+bug/1755279
550
+                local cinder_url
551
+                cinder_url=$CINDER_SERVICE_PROTOCOL://$SERVICE_HOST:$CINDER_SERVICE_PORT/v3
552
+                OS_USER_ID=$OS_USERNAME OS_PROJECT_ID=$OS_PROJECT_NAME cinder --os-auth-type noauth --os-endpoint=$cinder_url type-create ${be_name}
553
+                OS_USER_ID=$OS_USERNAME OS_PROJECT_ID=$OS_PROJECT_NAME cinder --os-auth-type noauth --os-endpoint=$cinder_url type-key ${be_name} set volume_backend_name=${be_name}
554
+            fi
545 555
         done
546 556
     fi
547 557
 }