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/bm-eu-cloud.env b/tcp_tests/templates/_heat_environments/bm-eu-cloud.env
new file mode 100644
index 0000000..149a7af
--- /dev/null
+++ b/tcp_tests/templates/_heat_environments/bm-eu-cloud.env
@@ -0,0 +1,51 @@
+
+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
+ "MCP::VsrxNode": fragments/VsrxNode.yaml
+ "MCP::Subnets": fragments/Subnets.yaml
+
+parameter_defaults:
+
+ cfg_flavor: system.virtual.salt_master
+ ctl_flavor: system.compact.openstack.control
+ cid_flavor: system.compact.cicd.control
+ ntw_flavor: system.compact.opencontrail.control
+ nal_flavor: system.compact.opencontrail.analytics
+ dbs_flavor: system.compact.openstack.database
+ msg_flavor: system.compact.openstack.message_queue
+ mon_flavor: system.compact.stacklight.server
+ log_flavor: system.compact.stacklight.log
+ mtr_flavor: system.compact.stacklight.telemetry
+ cmp_flavor: system.virtual.openstack.compute
+ cmn_flavor: system.compact.ceph.mon
+ rgw_flavor: system.compact.ceph.rgw
+ osd_flavor: system.virtual.ceph.osd
+ dns_flavor: system.compact.openstack.dns
+ kmn_flavor: system.compact.openstack.barbican
+ prx_flavor: system.compact.openstack.proxy
+ gtw_flavor: system.compact.openstack.gateway
+ kvm_fake_flavor: system.virtual.fake_kvm
+ mdb_flavor: system.compact.openstack.telemetry
+ foundation_flavor: system.virtual.foundation
+ vsrx_flavor: oc_vsrx
+ key_pair: system_key_8133
+ bm_availability_zone: BM
+ net_public: public
+
+ foundation_image: system.foundation
+ nameservers: 172.18.208.44
+ control_subnet_cidr: "10.6.0.0/24"
+ tenant_subnet_cidr: "10.8.0.0/24"
+ external_subnet_cidr: "192.168.200.0/24"
+ management_subnet_cidr: "172.16.49.64/26"
+ management_subnet_cfg01_ip: 172.16.49.66
+ management_subnet_gateway_ip: 172.16.49.65
+ management_subnet_pool_start: 172.16.49.68
+ management_subnet_pool_end: 172.16.49.124
+ salt_master_control_ip: 10.6.0.15