diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2017-11-02 02:17:37 +0000 |
|---|---|---|
| committer | Linda Wang <wangwulin@huawei.com> | 2017-11-02 02:27:22 +0000 |
| commit | a1669b0c8ed48cc1f63143c91ffad6b86fb85516 (patch) | |
| tree | 7471a8696c712b6e3eaab83f0bc5ef65e3449ade | |
| parent | 639dac66f284f12021b12e95e12c389f0ed1e645 (diff) | |
Adopt new config schema for rally 0.10
The new config schema is used by Rally 0.10:
https://raw.githubusercontent.com/openstack/rally/master/samples/deployments/existing-keystone-v3.json
JIRA: FUNCTEST-883
Change-Id: I67c0081e23d7a763934ef2f8ce09f122c33af902
Signed-off-by: Linda Wang <wangwulin@huawei.com>
| -rw-r--r-- | functest/utils/openstack_utils.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py index d8b1cf6f..ef32a7e6 100644 --- a/functest/utils/openstack_utils.py +++ b/functest/utils/openstack_utils.py @@ -132,7 +132,7 @@ def source_credentials(rc_file): def get_credentials_for_rally(): creds = get_credentials() env_cred_dict = get_env_cred_dict() - rally_conf = {"type": "ExistingCloud", "admin": {}} + rally_conf = {"admin": {}} for key in creds: if key == 'auth_url': rally_conf[key] = creds[key] @@ -159,6 +159,7 @@ def get_credentials_for_rally(): insecure_key = env_cred_dict.get('OS_INSECURE') rally_conf[insecure_key] = os.getenv('OS_INSECURE', '').lower() == 'true' + rally_conf = {"openstack": rally_conf} return rally_conf |