Browse code

Merge "Iniset keystone auth version"

Jenkins authored on 2014/03/08 10:46:33
Showing 1 changed files
... ...
@@ -267,6 +267,7 @@ function configure_tempest {
267 267
     iniset $TEMPEST_CONFIG identity admin_username $ADMIN_USERNAME
268 268
     iniset $TEMPEST_CONFIG identity admin_password "$password"
269 269
     iniset $TEMPEST_CONFIG identity admin_tenant_name $ADMIN_TENANT_NAME
270
+    iniset $TEMPEST_CONFIG identity auth_version ${TEMPEST_AUTH_VERSION:-v2}
270 271
 
271 272
     # Image
272 273
     # for the gate we want to be able to override this variable so we aren't