Browse code

Merge "Always defines tempest_roles as Member"

Jenkins authored on 2015/03/26 13:23:37
Showing 1 changed files
... ...
@@ -311,9 +311,7 @@ function configure_tempest {
311 311
 
312 312
     # Auth
313 313
     iniset $TEMPEST_CONFIG auth allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True}
314
-    if [[ "$TEMPEST_AUTH_VERSION" == "v3" ]]; then
315
-        iniset $TEMPEST_CONFIG auth tempest_roles "Member"
316
-    fi
314
+    iniset $TEMPEST_CONFIG auth tempest_roles "Member"
317 315
 
318 316
     # Compute
319 317
     iniset $TEMPEST_CONFIG compute ssh_user ${DEFAULT_INSTANCE_USER:-cirros} # DEPRECATED