@@ -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"