commit 128d4d2d1ee4bfc63fac76413d2e619e0de90ab1
author Ilya Bumarskov <bumarskov@gmail.com> Mon Dec 27 10:43:09 2021 +0400
committer Anton Samoylov <asamoylov@mirantis.com> Tue Mar 01 19:08:09 2022 +0400
tree adb6c832b30bb5f0fe22a3af69e8b9f86ce42c5b
parent 03b52aadcda0d5d4973eb58f2d2af7ca44ba240f

Integrate vMX in tungstenfabric environment

Related-PROD: PRODX-20668
Change-Id: I202bf3a25cf7fd4b70b43ce6d0b3e1397872c9ed

de/heat-templates/env/mstr1-wrkr5-cmp2-ntw3.yaml

diff --git a/de/heat-templates/env/mstr1-wrkr5-cmp2-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr5-cmp2-ntw3.yaml
index 658d577..7bf7d3c 100644
--- a/de/heat-templates/env/mstr1-wrkr5-cmp2-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr5-cmp2-ntw3.yaml
@@ -1,12 +1,13 @@
 resource_registry:
   "MCP2::NetworkAcc": ../fragments/NetworkAccVM.yaml
   "MCP2::NetworkAccStorage": ../fragments/NetworkAccVMStorage.yaml
-  "MCP2::NetworkPrvFl": ../fragments/NetworkPrvFlVSRX.yaml
+  "MCP2::NetworkPrvFl": ../fragments/NetworkPrvFl.yaml
   "MCP2::NetworkIronicFlat": ../fragments/NetworkIronicFlat.yaml
   "MCP2::NetworkTun": ../fragments/NetworkTun.yaml
   "MCP2::SrvInstances": ../fragments/SrvInstancesVM.yaml
   "MCP2::SrvInstancesCeph": ../fragments/SrvInstancesVMCeph.yaml
   "MCP2::SrvInstancesCephOSD": ../fragments/SrvInstancesVMCephOSD.yaml
+  "MCP2::VSRX": ../fragments/vSRX.yaml
 
 parameters:
   image: bionic-server-cloudimg-amd64-20190612
@@ -25,8 +26,8 @@
   private_floating_network_ipam_pool_start: '10.11.12.3'
   private_floating_network_ipam_pool_end: '10.11.12.99'
   private_floating_network_gateway: '10.11.12.1'
-  control_network_vsrx_peering_ip: '10.10.0.131'
-  data_network_vsrx_ip: '10.15.0.131'
+  control_network_ext_router_ip: '10.10.0.131'
+  tun_network_ext_router_ip: '10.15.0.131'
   private_floating_interface: 'ens4'
   tunnel_interface: 'ens8'
   worker_metadata: {"labels": {"openstack-control-plane":"enabled","local-volume-provisioner": "enabled"}}