Add new vm_availability_zone and use it for virtual environments
Change-Id: I4ee0abef632fdec03a6a673d28e23142e3e65861
diff --git a/tcp_tests/templates/_heat_environments/bm-eu-cloud.env b/tcp_tests/templates/_heat_environments/bm-eu-cloud.env
index 149a7af..56a080b 100644
--- a/tcp_tests/templates/_heat_environments/bm-eu-cloud.env
+++ b/tcp_tests/templates/_heat_environments/bm-eu-cloud.env
@@ -36,6 +36,7 @@
vsrx_flavor: oc_vsrx
key_pair: system_key_8133
bm_availability_zone: BM
+ vm_availability_zone: nova
net_public: public
foundation_image: system.foundation
diff --git a/tcp_tests/templates/_heat_environments/bm-ovs-cloud.env b/tcp_tests/templates/_heat_environments/bm-ovs-cloud.env
index 86d4085..9a801f4 100644
--- a/tcp_tests/templates/_heat_environments/bm-ovs-cloud.env
+++ b/tcp_tests/templates/_heat_environments/bm-ovs-cloud.env
@@ -32,6 +32,7 @@
foundation_flavor: system.virtual.foundation
key_pair: system_key_8133
bm_availability_zone: BM
+ vm_availability_zone: nova
net_public: public
foundation_image: system.foundation
diff --git a/tcp_tests/templates/_heat_environments/microcloud-8116-cookied-cicd-queens-dvr-sl.sh b/tcp_tests/templates/_heat_environments/create_environment_example.sh
similarity index 100%
rename from tcp_tests/templates/_heat_environments/microcloud-8116-cookied-cicd-queens-dvr-sl.sh
rename to tcp_tests/templates/_heat_environments/create_environment_example.sh
diff --git a/tcp_tests/templates/_heat_environments/eu-cloud.env b/tcp_tests/templates/_heat_environments/eu-cloud.env
index b2f1396..887f538 100644
--- a/tcp_tests/templates/_heat_environments/eu-cloud.env
+++ b/tcp_tests/templates/_heat_environments/eu-cloud.env
@@ -37,6 +37,7 @@
key_pair: system_key_8133
bm_availability_zone: BM
+ vm_availability_zone: nova
net_public: public
foundation_image: system.foundation
diff --git a/tcp_tests/templates/_heat_environments/fragments/Compute.yaml b/tcp_tests/templates/_heat_environments/fragments/Compute.yaml
index 39ff118..6efefa2 100644
--- a/tcp_tests/templates/_heat_environments/fragments/Compute.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/Compute.yaml
@@ -30,6 +30,8 @@
role:
type: comma_delimited_list
default: [salt_minion]
+ availability_zone:
+ type: string
resources:
instance_port01:
@@ -66,6 +68,7 @@
flavor: { get_param: instance_flavor }
image: { list_join: ['', [ 'ubuntu-vcp-', { get_param: mcp_version } ]] }
key_name: { get_param: key_pair }
+ availability_zone: { get_param: availability_zone }
name:
list_join:
- '.'
diff --git a/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml b/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml
index 533edc0..83d91c1 100644
--- a/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml
@@ -46,7 +46,7 @@
role:
type: comma_delimited_list
default: [foundation_jenkins_slave]
- bm_availability_zone:
+ availability_zone:
type: string
resources:
@@ -90,7 +90,7 @@
flavor: { get_param: instance_flavor }
image: { get_param: instance_image }
key_name: { get_param: key_pair }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: availability_zone }
name:
list_join:
- '.'
diff --git a/tcp_tests/templates/_heat_environments/fragments/Instance.yaml b/tcp_tests/templates/_heat_environments/fragments/Instance.yaml
index 9ffe121..b86f40d 100644
--- a/tcp_tests/templates/_heat_environments/fragments/Instance.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/Instance.yaml
@@ -30,6 +30,8 @@
role:
type: comma_delimited_list
default: [salt_minion]
+ availability_zone:
+ type: string
resources:
instance_port01:
@@ -66,6 +68,7 @@
flavor: { get_param: instance_flavor }
image: { list_join: ['', [ 'ubuntu-vcp-', { get_param: mcp_version } ]] }
key_name: { get_param: key_pair }
+ availability_zone: { get_param: availability_zone }
name:
list_join:
- '.'
diff --git a/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml b/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml
index 24123b3..25abaf9 100644
--- a/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml
@@ -36,7 +36,7 @@
role:
type: comma_delimited_list
default: [salt_master]
- bm_availability_zone:
+ availability_zone:
type: string
resources:
@@ -83,7 +83,7 @@
flavor: { get_param: cfg01_flavor }
image: { list_join: ['', [ 'cfg01-day01-', { get_param: mcp_version } ]] }
key_name: { get_param: key_pair }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: availability_zone }
name:
list_join:
- '.'
diff --git a/tcp_tests/templates/_heat_environments/fragments/MultipleInstance.yaml b/tcp_tests/templates/_heat_environments/fragments/MultipleInstance.yaml
index bf14ee0..c6fcc02 100644
--- a/tcp_tests/templates/_heat_environments/fragments/MultipleInstance.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/MultipleInstance.yaml
@@ -50,6 +50,9 @@
type: string
env_name:
type: string
+ availability_zone:
+ type: string
+
resources:
instance01:
@@ -58,6 +61,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
key_pair: { get_param: key_pair }
+ availability_zone: { get_param: availability_zone }
control_net_static_ip: {get_param: instance01_control_net_static_ip }
tenant_net_static_ip: {get_param: instance01_tenant_net_static_ip }
external_net_static_ip: {get_param: instance01_external_net_static_ip }
@@ -74,6 +78,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
key_pair: { get_param: key_pair }
+ availability_zone: { get_param: availability_zone }
control_net_static_ip: {get_param: instance02_control_net_static_ip }
tenant_net_static_ip: {get_param: instance02_tenant_net_static_ip }
external_net_static_ip: {get_param: instance02_external_net_static_ip }
@@ -90,6 +95,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
key_pair: { get_param: key_pair }
+ availability_zone: { get_param: availability_zone }
control_net_static_ip: {get_param: instance03_control_net_static_ip }
tenant_net_static_ip: {get_param: instance03_tenant_net_static_ip }
external_net_static_ip: {get_param: instance03_external_net_static_ip }
diff --git a/tcp_tests/templates/_heat_environments/fragments/VsrxNode.yaml b/tcp_tests/templates/_heat_environments/fragments/VsrxNode.yaml
index e0e3a84..e965058 100644
--- a/tcp_tests/templates/_heat_environments/fragments/VsrxNode.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/VsrxNode.yaml
@@ -37,6 +37,8 @@
type: string
mcp_version:
type: string
+ availability_zone:
+ type: string
resources:
instance_port01:
@@ -73,6 +75,7 @@
flavor: { get_param: instance_flavor }
image: { get_param: instance_image }
key_name: { get_param: key_pair }
+ availability_zone: { get_param: availability_zone }
name:
list_join:
- '.'
diff --git a/tcp_tests/templates/_heat_environments/microcloud-8133.env b/tcp_tests/templates/_heat_environments/microcloud-8133.env
deleted file mode 100644
index cd77154..0000000
--- a/tcp_tests/templates/_heat_environments/microcloud-8133.env
+++ /dev/null
@@ -1,43 +0,0 @@
-
-resource_registry:
- "MCP::MultipleInstance": fragments/MultipleInstance.yaml
- "MCP::Flavors": fragments/Flavors.yaml
- "MCP::MasterNode": fragments/MasterNode.yaml
- "MCP::Compute": fragments/Compute.yaml
- "MCP::Networks": fragments/Networks.yaml
- "MCP::SingleInstance": fragments/Instance.yaml
- "MCP::FoundationNode": fragments/FoundationNode.yaml
-
-parameter_defaults:
-
- cfg_flavor: system.virtual.salt_master
- ctl_flavor: system.golden.openstack.control
- cid_flavor: system.golden.cicd.control
- ntw_flavor: system.compact.opencontrail.control
- nal_flavor: system.compact.opencontrail.analytics
- dbs_flavor: system.golden.openstack.database
- msg_flavor: system.golden.openstack.message_queue
- mon_flavor: system.golden.stacklight.server
- log_flavor: system.golden.stacklight.log
- mtr_flavor: system.golden.stacklight.telemetry
- cmp_flavor: system.virtual.openstack.compute
- kvm_fake_flavor: system.virtual.fake_kvm
- osd_flavor: system.virtual.ceph.osd
- cmn_flavor: system.golden.ceph.mon
- rgw_flavor: system.golden.ceph.rgw
- foundation_flavor: system.virtual.foundation
-
- key_pair: system_key_8133
-
- net_public: public
-
- nameservers: 172.18.208.44
- control_subnet_cidr: "10.6.0.0/24"
- tenant_subnet_cidr: "10.8.0.0/24"
- external_subnet_cidr: "10.9.0.0/24"
- management_subnet_cidr: "10.7.0.0/24"
- management_subnet_cfg01_ip: 10.7.0.15
- management_subnet_gateway_ip: 10.7.0.1
- management_subnet_pool_start: 10.7.0.20
- management_subnet_pool_end: 10.7.0.60
- salt_master_control_ip: 10.6.0.15