diff options
| author | Steve Baker <sbaker@redhat.com> | 2016-08-13 09:52:41 +1200 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2016-08-13 09:52:41 +1200 |
| commit | 2af6c6ffdc934439e99c3d7805826c3d6d1957a8 (patch) | |
| tree | 8183540af14e41d100f0a2999b5c469cbb967d7c /devstack/upgrade | |
| parent | 6d8f2968efe6ad0843022e8001be8fcb47447e24 (diff) | |
| download | heat-2af6c6ffdc934439e99c3d7805826c3d6d1957a8.tar.gz | |
Do not use env var conf defaults
Falling back to environment variable credentials is convenient for
development but could lead to unexpected credentials being used during
tests. Also this is not a known practice for tempest tests.
This change removes the env var defaults and explicitly sets the
credentials to use in prepare_test_env.sh.
Pre and post grenade tests also get their config from the conf file
rather than the environment.
blueprint tempest-plugin-support
Change-Id: Icf9fb4c58ed11483106c2b62d1e1093223f7dc51
Diffstat (limited to 'devstack/upgrade')
| -rwxr-xr-x | devstack/upgrade/resources.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh index 6ee2e313c..f7e25d28b 100755 --- a/devstack/upgrade/resources.sh +++ b/devstack/upgrade/resources.sh @@ -18,6 +18,7 @@ source $GRENADE_DIR/grenaderc source $GRENADE_DIR/functions source $TOP_DIR/openrc admin admin +source $TOP_DIR/inc/ini-config set -o xtrace @@ -35,6 +36,14 @@ function _heat_set_user { function create { # run heat_integrationtests instead of tempest smoke before create pushd $BASE_DEVSTACK_DIR/../heat + conf_file=heat_integrationtests/heat_integrationtests.conf + iniset $conf_file heat_plugin username $OS_USERNAME + iniset $conf_file heat_plugin password $OS_PASSWORD + iniset $conf_file heat_plugin tenant_name $OS_PROJECT_NAME + iniset $conf_file heat_plugin auth_url $OS_AUTH_URL + iniset $conf_file heat_plugin user_domain_name $OS_USER_DOMAIN_NAME + iniset $conf_file heat_plugin project_domain_name $OS_PROJECT_DOMAIN_NAME + iniset $conf_file heat_plugin region $OS_REGION_NAME tox -eintegration heat_integrationtests.functional.test_create_update popd |