Browse code

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

Matthew Treinish authored on 2016/03/05 00:36:10
Showing 1 changed files
... ...
@@ -554,9 +554,9 @@ function configure_tempest {
554 554
     iniset $TEMPEST_CONFIG auth tempest_roles "Member"
555 555
     if [[ $TEMPEST_USE_TEST_ACCOUNTS == "True" ]]; then
556 556
         if [[ $TEMPEST_HAS_ADMIN == "True" ]]; then
557
-            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
557
+            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
558 558
         else
559
-            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
559
+            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
560 560
         fi
561 561
         iniset $TEMPEST_CONFIG auth use_dynamic_credentials False
562 562
         iniset $TEMPEST_CONFIG auth test_accounts_file "etc/accounts.yaml"