Change networks and subnets schemes due to different
ways of deploying BM cloud or virtaul
Add heat template for BM deploy (heat-bm-cicd-queens-contrail-sl)
Add bm-eu-cloud.env with parameters for BM deploy
Normalize output for getting correct IP of foundation node
Align all virtual models to new changes
Change-Id: I1e0daac4e82aea06e75de61d2fc5041e6ec4d138
diff --git a/tcp_tests/templates/_heat_environments/eu-cloud.env b/tcp_tests/templates/_heat_environments/eu-cloud.env
index 7f670c5..b2f1396 100644
--- a/tcp_tests/templates/_heat_environments/eu-cloud.env
+++ b/tcp_tests/templates/_heat_environments/eu-cloud.env
@@ -8,6 +8,7 @@
"MCP::SingleInstance": fragments/Instance.yaml
"MCP::FoundationNode": fragments/FoundationNode.yaml
"MCP::VsrxNode": fragments/VsrxNode.yaml
+ "MCP::Subnets": fragments/Subnets.yaml
parameter_defaults:
@@ -25,7 +26,7 @@
cmp_flavor: system.virtual.openstack.compute
cmn_flavor: system.compact.ceph.mon
rgw_flavor: system.compact.ceph.rgw
- osd_flavor: system.virtual.openstack.compute
+ osd_flavor: system.virtual.ceph.osd
dns_flavor: system.compact.openstack.dns
kmn_flavor: system.compact.openstack.barbican
prx_flavor: system.compact.openstack.proxy
@@ -35,7 +36,7 @@
vsrx_flavor: oc_vsrx
key_pair: system_key_8133
-
+ bm_availability_zone: BM
net_public: public
foundation_image: system.foundation