From 6cf412bb7ee2f667c38cf113440018b1ffcc7546 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Fri, 4 Mar 2016 10:36:10 -0500 Subject: [PATCH] Update account generator calls with correct password Change I380dd20e5ed716a0bdf92aa02c3730359b8136e4 updated the tempest configuration to stop creating a bunch of globals. But as part of that refactor it started using $admin_password as the password argument for tempest-account generator, which is never defined. This commit rectifies the situation by using the correct variable $password. Change-Id: Ieeed58751e5784020e04bcc2911ac74791662110 --- lib/tempest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tempest b/lib/tempest index 8d3bf7cd6b..4fb3e5edca 100644 --- a/lib/tempest +++ b/lib/tempest @@ -554,9 +554,9 @@ function configure_tempest { iniset $TEMPEST_CONFIG auth tempest_roles "Member" if [[ $TEMPEST_USE_TEST_ACCOUNTS == "True" ]]; then if [[ $TEMPEST_HAS_ADMIN == "True" ]]; then - tempest-account-generator -c $TEMPEST_CONFIG --os-username $admin_username --os-password $admin_password --os-tenant-name $admin_tenant_name -r $TEMPEST_CONCURRENCY --with-admin etc/accounts.yaml + tempest-account-generator -c $TEMPEST_CONFIG --os-username $admin_username --os-password "$password" --os-tenant-name $admin_tenant_name -r $TEMPEST_CONCURRENCY --with-admin etc/accounts.yaml 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 + tempest-account-generator -c $TEMPEST_CONFIG --os-username $admin_username --os-password "$password" --os-tenant-name $admin_tenant_name -r $TEMPEST_CONCURRENCY etc/accounts.yaml fi iniset $TEMPEST_CONFIG auth use_dynamic_credentials False iniset $TEMPEST_CONFIG auth test_accounts_file "etc/accounts.yaml"