diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2018-01-29 07:37:37 +0000 |
|---|---|---|
| committer | Linda Wang <wangwulin@huawei.com> | 2018-02-01 14:38:16 +0000 |
| commit | 1825aa713952288e4204ea3b38f0d3c0635a6918 (patch) | |
| tree | 1f5174de93defbf8e703c73785eaaa118f4a940e /functest/opnfv_tests/openstack | |
| parent | 416461c30d5a9a0df38e6c1bdef7061fce2c7eaf (diff) | |
Rename a common credential file for OS and K8S
Change-Id: Ib8d24be4b29ab1de00d5dd5e3442146b2437cb94
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'functest/opnfv_tests/openstack')
| -rw-r--r-- | functest/opnfv_tests/openstack/refstack_client/tempest_conf.py | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/snaps_utils.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py b/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py index 5764f366..758d7684 100644 --- a/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py +++ b/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py @@ -36,7 +36,7 @@ class TempestConf(object): """ Generate tempest.conf file""" try: openstack_utils.source_credentials( - CONST.__getattribute__('openstack_creds')) + CONST.__getattribute__('env_file')) resources = self.resources.create(create_project=True, use_custom_images=True, use_custom_flavors=True) diff --git a/functest/opnfv_tests/openstack/snaps/snaps_utils.py b/functest/opnfv_tests/openstack/snaps/snaps_utils.py index 6b0ee497..e2f75c3f 100644 --- a/functest/opnfv_tests/openstack/snaps/snaps_utils.py +++ b/functest/opnfv_tests/openstack/snaps/snaps_utils.py @@ -55,7 +55,7 @@ def get_credentials(proxy_settings_str=None, ssh_proxy_cmd=None): creds_override = CONST.__getattribute__( 'snaps_os_creds_override') os_creds = openstack_tests.get_credentials( - os_env_file=CONST.__getattribute__('openstack_creds'), + os_env_file=CONST.__getattribute__('env_file'), proxy_settings_str=proxy_settings_str, ssh_proxy_cmd=ssh_proxy_cmd, overrides=creds_override) return os_creds |