@@ -281,18 +281,12 @@ function configure_tempest {

     # Identity

     iniset $TEMPEST_CONFIG identity uri "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:5000/v2.0/"

     iniset $TEMPEST_CONFIG identity uri_v3 "$KEYSTONE_SERVICE_URI_V3"

-    iniset $TEMPEST_CONFIG identity username $TEMPEST_USERNAME

-    iniset $TEMPEST_CONFIG identity password "$password"

-    iniset $TEMPEST_CONFIG identity tenant_name $TEMPEST_TENANT_NAME

-    iniset $TEMPEST_CONFIG identity alt_username $ALT_USERNAME

-    iniset $TEMPEST_CONFIG identity alt_password "$password"

-    iniset $TEMPEST_CONFIG identity alt_tenant_name $ALT_TENANT_NAME

     if [[ "$TEMPEST_HAS_ADMIN" == "True" ]]; then

-        iniset $TEMPEST_CONFIG identity admin_username $ADMIN_USERNAME

-        iniset $TEMPEST_CONFIG identity admin_password "$password"

-        iniset $TEMPEST_CONFIG identity admin_tenant_name $ADMIN_TENANT_NAME

-        iniset $TEMPEST_CONFIG identity admin_tenant_id $ADMIN_TENANT_ID

-        iniset $TEMPEST_CONFIG identity admin_domain_name $ADMIN_DOMAIN_NAME

+        iniset $TEMPEST_CONFIG auth admin_username $ADMIN_USERNAME

+        iniset $TEMPEST_CONFIG auth admin_password "$password"

+        iniset $TEMPEST_CONFIG auth admin_tenant_name $ADMIN_TENANT_NAME

+        iniset $TEMPEST_CONFIG auth admin_tenant_id $ADMIN_TENANT_ID

+        iniset $TEMPEST_CONFIG auth admin_domain_name $ADMIN_DOMAIN_NAME

     fi

     if [ "$ENABLE_IDENTITY_V2" == "False" ]; then

         # Only Identity v3 is available; then skip Identity API v2 tests

@@ -319,11 +313,7 @@ function configure_tempest {

     # Compute

     iniset $TEMPEST_CONFIG compute ssh_user ${DEFAULT_INSTANCE_USER:-cirros} # DEPRECATED

-    iniset $TEMPEST_CONFIG compute network_for_ssh $PRIVATE_NETWORK_NAME

-    iniset $TEMPEST_CONFIG compute ip_version_for_ssh 4

-    iniset $TEMPEST_CONFIG compute ssh_timeout $BUILD_TIMEOUT

     iniset $TEMPEST_CONFIG compute image_ref $image_uuid

-    iniset $TEMPEST_CONFIG compute image_ssh_user ${DEFAULT_INSTANCE_USER:-cirros}

     iniset $TEMPEST_CONFIG compute image_ref_alt $image_uuid_alt

     iniset $TEMPEST_CONFIG compute image_alt_ssh_user ${ALT_INSTANCE_USER:-cirros}

     iniset $TEMPEST_CONFIG compute flavor_ref $flavor_ref

@@ -480,6 +470,10 @@ function configure_tempest {

     # Validation

     iniset $TEMPEST_CONFIG validation run_validation ${TEMPEST_RUN_VALIDATION:-False}

+    iniset $TEMPEST_CONFIG validation ip_version_for_ssh 4

+    iniset $TEMPEST_CONFIG validation ssh_timeout $BUILD_TIMEOUT

+    iniset $TEMPEST_CONFIG validation image_ssh_user ${DEFAULT_INSTANCE_USER:-cirros}

+    iniset $TEMPEST_CONFIG validation network_for_ssh $PRIVATE_NETWORK_NAME

     # Volume

     # TODO(dkranz): Remove the bootable flag when Juno is end of life.

@@ -525,7 +519,6 @@ function configure_tempest {

     # Dashboard

     iniset $TEMPEST_CONFIG dashboard dashboard_url "http://$SERVICE_HOST/"

-    iniset $TEMPEST_CONFIG dashboard login_url "http://$SERVICE_HOST/auth/login/"

     # CLI

     iniset $TEMPEST_CONFIG cli cli_dir $NOVA_BIN_DIR

@@ -592,13 +585,13 @@ function configure_tempest {

         else

             tempest-account-generator -c $TEMPEST_CONFIG --os-username $ADMIN_USERNAME --os-password $ADMIN_PASSWORD --os-tenant-name $ADMIN_TENANT_NAME -r $TEMPEST_CONCURRENCY etc/accounts.yaml

         fi

-        iniset $TEMPEST_CONFIG auth allow_tenant_isolation False

+        iniset $TEMPEST_CONFIG auth use_dynamic_credentials False

         iniset $TEMPEST_CONFIG auth test_accounts_file "etc/accounts.yaml"

     elif [[ $TEMPEST_HAS_ADMIN == "False" ]]; then

-        iniset $TEMPEST_CONFIG auth allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-False}

+        iniset $TEMPEST_CONFIG auth use_dynamic_credentials ${TEMPEST_ALLOW_TENANT_ISOLATION:-False}

     else

-        iniset $TEMPEST_CONFIG auth allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True}

+        iniset $TEMPEST_CONFIG auth use_dynamic_credentials ${TEMPEST_ALLOW_TENANT_ISOLATION:-True}

     fi

     # Restore IFS