From 417901252e047e3585e2494dc34f74e557fed8fa Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Wed, 29 Jan 2020 14:11:43 +0100 Subject: Remove cloud settings from vcpeconfig.yaml Additionally clouds.yaml.example is provided with integration lab cloud settings. Change-Id: I214217e5b239303c4485c855cdf81bd0250de6e5 Signed-off-by: Bartek Grzybowski Issue-ID: INT-1409 --- test/vcpe/clouds.yaml.example | 23 +++++++++++++++++++++++ test/vcpe/vcpeconfig-oom_disabled.yaml | 13 ++----------- test/vcpe/vcpeconfig.yaml | 13 ++----------- 3 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 test/vcpe/clouds.yaml.example (limited to 'test') diff --git a/test/vcpe/clouds.yaml.example b/test/vcpe/clouds.yaml.example new file mode 100644 index 000000000..0b2bdc070 --- /dev/null +++ b/test/vcpe/clouds.yaml.example @@ -0,0 +1,23 @@ +clouds: + integration-release-daily: + auth: + auth_url: 'http://10.12.25.2:5000' + username: 'kxi' + user_domain_id: 'default' + project_domain_id: 'default' + tenant_id: '712b6016580e410b9abfec9ca34953ce' + password: 'n3JhGMGuDzD8' + project_domain_name: 'Integration-Release-Daily' + region_name: 'RegionOne' + identity_api_version: '3' + integration-sb-07: + auth: + auth_url: 'http://10.12.25.2:5000' + username: 'kxi' + user_domain_id: 'default' + project_domain_id: 'default' + tenant_id: '1e097c6713e74fd7ac8e4295e605ee1e' + password: 'n3JhGMGuDzD8' + project_domain_name: 'Integration-SB-07' + region_name: 'RegionOne' + identity_api_version: '3' diff --git a/test/vcpe/vcpeconfig-oom_disabled.yaml b/test/vcpe/vcpeconfig-oom_disabled.yaml index f327aa1c9..0c2fd7ea9 100644 --- a/test/vcpe/vcpeconfig-oom_disabled.yaml +++ b/test/vcpe/vcpeconfig-oom_disabled.yaml @@ -14,17 +14,8 @@ oom_mode: False gra_api_flag: False ########################### -# set Openstack credentials -cloud: - '--os-auth-url': 'http://10.12.25.2:5000' - '--os-username': 'kxi' - '--os-user-domain-id': 'default' - '--os-project-domain-id': 'default' - '--os-tenant-id': '1e097c6713e74fd7ac8e4295e605ee1e' - '--os-region-name': 'RegionOne' - '--os-password': 'n3JhGMGuDzD8' - '--os-project-domain-name': 'Integration-SB-07' - '--os-identity-api-version': '3' +# set Openstack cloud name +cloud_name: 'integration-sb-07' ############################################################################ # set oam and public network which must exist in openstack before deployment diff --git a/test/vcpe/vcpeconfig.yaml b/test/vcpe/vcpeconfig.yaml index e0477321c..36af1b684 100644 --- a/test/vcpe/vcpeconfig.yaml +++ b/test/vcpe/vcpeconfig.yaml @@ -14,17 +14,8 @@ oom_mode: True gra_api_flag: False ########################### -# set Openstack credentials -cloud: - '--os-auth-url': 'http://10.12.25.2:5000' - '--os-username': 'kxi' - '--os-user-domain-id': 'default' - '--os-project-domain-id': 'default' - '--os-tenant-id': '712b6016580e410b9abfec9ca34953ce' - '--os-region-name': 'RegionOne' - '--os-password': 'n3JhGMGuDzD8' - '--os-project-domain-name': 'Integration-Release-Daily' - '--os-identity-api-version': '3' +# set Openstack cloud name +cloud_name: 'integration-release-daily' ############################################################################ # set oam and public network which must exist in openstack before deployment -- cgit 1.2.3-korg