aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2020-01-29 14:11:43 +0100
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2020-01-29 14:11:43 +0100
commit417901252e047e3585e2494dc34f74e557fed8fa (patch)
tree4f69f95eceeb6e4ebbc4dcd2cf0e11a2babbb5e8
parent8eb99ceaae49e635eb518ca985f8ee5cbe6449c6 (diff)
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 <b.grzybowski@partner.samsung.com> Issue-ID: INT-1409
-rw-r--r--test/vcpe/clouds.yaml.example23
-rw-r--r--test/vcpe/vcpeconfig-oom_disabled.yaml13
-rw-r--r--test/vcpe/vcpeconfig.yaml13
3 files changed, 27 insertions, 22 deletions
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