diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-08 16:40:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-08 16:40:34 +0000 |
| commit | 9d19d1ff0bf7a5aada78bfc86cae831bcec86cc9 (patch) | |
| tree | 9f107cc19478ff179ec148e48e58fafde651f53b /testcases/OpenStack/tempest/gen_tempest_conf.py | |
| parent | 4bd8e5f735562c38ad90c411f74f642c6e3ec73f (diff) | |
| parent | 55d301a2622ff5b63d431b9272caa68224d53843 (diff) | |
Merge "make use of functest_utils.get_parameter_from_yaml"
Diffstat (limited to 'testcases/OpenStack/tempest/gen_tempest_conf.py')
| -rwxr-xr-x | testcases/OpenStack/tempest/gen_tempest_conf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testcases/OpenStack/tempest/gen_tempest_conf.py b/testcases/OpenStack/tempest/gen_tempest_conf.py index 688a92402..ca671d00d 100755 --- a/testcases/OpenStack/tempest/gen_tempest_conf.py +++ b/testcases/OpenStack/tempest/gen_tempest_conf.py @@ -55,10 +55,10 @@ def configure_tempest_multisite(deployment_dir): kingbird_conf_path = "/etc/kingbird/kingbird.conf" installer_type = os.getenv('INSTALLER_TYPE', 'Unknown') installer_ip = os.getenv('INSTALLER_IP', 'Unknown') - installer_username = ft_utils.get_parameter_from_yaml( + installer_username = ft_utils.get_functest_config( "multisite." + installer_type + "_environment.installer_username") - installer_password = ft_utils.get_parameter_from_yaml( + installer_password = ft_utils.get_functest_config( "multisite." + installer_type + "_environment.installer_password") |