Set tunnel interface and extend outputs for TF deployment
Related-PROD: PRODX-7074
Change-Id: I75a37ba13cf05a7b7e68a6708515b033b75741dc
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
index fc3ccf0..7bfb0b9 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
@@ -29,6 +29,7 @@
control_network_vsrx_peering_ip: '10.10.0.131'
data_network_vsrx_ip: '10.15.0.131'
private_floating_interface: 'ens4'
+ tunnel_interface: 'ens8'
worker_metadata: {"labels": {"openstack-control-plane":"enabled""role":"ceph-osd-node"}}
cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node","local-volume-provisioner": "enabled"}}
lma_metadata: {"labels": {"role": "stacklight", "stacklight": "enabled","local-volume-provisioner": "enabled"}}
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
index e152c87..6c04f55 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
@@ -28,6 +28,7 @@
control_network_vsrx_peering_ip: '10.10.0.131'
data_network_vsrx_ip: '10.15.0.131'
private_floating_interface: 'ens4'
+ tunnel_interface: 'ens8'
worker_metadata: {"labels": {"openstack-control-plane":"enabled","role":"ceph-osd-node","local-volume-provisioner": "enabled"}}
cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node"}}
ntw_metadata: {"labels": {"tfconfig":"enabled","tfconfigdb":"enabled","tfcontrol":"enabled","tfanalytics":"enabled","tfanalyticsdb":"enabled","tfwebui":"enabled","local-volume-provisioner": "enabled"}}
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
index a98de50..3b41842 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
@@ -28,6 +28,7 @@
control_network_vsrx_peering_ip: '10.10.0.131'
data_network_vsrx_ip: '10.15.0.131'
private_floating_interface: 'ens4'
+ tunnel_interface: 'ens8'
worker_metadata: {"labels": {"openstack-control-plane":"enabled","role":"ceph-osd-node","local-volume-provisioner": "enabled"}}
cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node"}}
ntw_metadata: {"labels": {"tfconfig":"enabled","tfconfigdb":"enabled","tfcontrol":"enabled","tfanalytics":"enabled","tfanalyticsdb":"enabled","tfwebui":"enabled","local-volume-provisioner": "enabled"}}
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma0-osd3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma0-osd3.yaml
index b62f79f..77988a7 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma0-osd3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma0-osd3.yaml
@@ -34,6 +34,7 @@
control_network_vsrx_peering_ip: '10.10.0.131'
data_network_vsrx_ip: '10.15.0.131'
private_floating_interface: 'ens4'
+ tunnel_interface: 'ens8'
worker_metadata: {"labels": {"openstack-control-plane":"enabled", "openvswitch":"enabled", "openstack-gateway": "enabled","local-volume-provisioner": "enabled","role": "stacklight", "stacklight": "enabled"}}
cmp_metadata: {"labels": {"openstack-compute-node": "enabled", "tfvrouter": "enabled"}}
osd_metadata: {"labels": {"role": "ceph-osd-node"}}
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma3-osd3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma3-osd3.yaml
index baf3fcf..4c17b19 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma3-osd3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma3-osd3.yaml
@@ -35,6 +35,7 @@
control_network_vsrx_peering_ip: '10.10.0.131'
data_network_vsrx_ip: '10.15.0.131'
private_floating_interface: 'ens4'
+ tunnel_interface: 'ens8'
worker_metadata: {"labels": {"openstack-control-plane": "enabled", "openvswitch": "enabled","openstack-gateway":"enabled","local-volume-provisioner": "enabled"}}
cmp_metadata: {"labels": {"openstack-compute-node": "enabled", "tfvrouter": "enabled"}}
lma_metadata: {"labels": {"role": "stacklight", "stacklight": "enabled","local-volume-provisioner": "enabled"}}
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 8f7ca7a..bfccd7a 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -752,3 +752,8 @@
storage_backend_network_cidr:
description: Storage network which is used as clusterNet in Ceph CR
value: { get_param: storage_backend_network_cidr }
+ tungstenfabric_enabled:
+ value: { get_param: tungstenfabric_enabled }
+ data_network_vsrx_ip:
+ description: IP address of vsrx in tungsten fabric data network
+ value: { get_param: data_network_vsrx_ip }
\ No newline at end of file