Replace host_interface with control_network_cidr
Add ability to autodetect interface name based on network CIDR
Related-Prod: PRODX-00000
Change-Id: I51b6701c4ca082c7560094cb25adcc615f5911d1
diff --git a/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml b/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml
index 0c8b3bc..e9e1944 100644
--- a/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml
@@ -16,7 +16,7 @@
lmas_flavor: oscore-bm-lab-01
osds_flavor: oscore-bm-lab-01
public_net_id: 'physnet1-402'
- host_interface: 'enp3s0f0'
+ control_network_cidr: '172.16.43.0/24'
masters_size: 0
worker_size: 3
cmp_size: 0
diff --git a/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp2-gtw0.yaml b/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp2-gtw0.yaml
index 3fefa93..abec7a1 100644
--- a/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp2-gtw0.yaml
@@ -16,7 +16,7 @@
lmas_flavor: oscore-bm-lab-01
osds_flavor: oscore-bm-lab-01
public_net_id: 'physnet1-402'
- host_interface: 'enp3s0f0'
+ control_network_cidr: '172.16.43.0/24'
masters_size: 0
worker_size: 3
cmp_size: 2
diff --git a/de/heat-templates/env/compute.yaml b/de/heat-templates/env/compute.yaml
index eb31703..f6875d6 100644
--- a/de/heat-templates/env/compute.yaml
+++ b/de/heat-templates/env/compute.yaml
@@ -9,7 +9,6 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
- host_interface: 'ens3'
masters_size: 2
worker_size: 3
cmp_size: 2
diff --git a/de/heat-templates/env/converged.yaml b/de/heat-templates/env/converged.yaml
index 9448af4..5e7a329 100644
--- a/de/heat-templates/env/converged.yaml
+++ b/de/heat-templates/env/converged.yaml
@@ -9,7 +9,6 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
- host_interface: 'ens3'
masters_size: 2
worker_size: 3
cmp_size: 0
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-lma3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-lma3.yaml
index c1b44d6..06e3813 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-lma3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-lma3.yaml
@@ -10,7 +10,6 @@
image: bionic-server-cloudimg-amd64-20190612
lmas_flavor: system.compact.stacklight.server
public_net_id: public
- host_interface: 'ens3'
masters_size: 0
worker_size: 3
cmp_size: 0
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
index 755e66f..5b3c057 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
@@ -9,7 +9,6 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
- host_interface: 'ens3'
masters_size: 0
worker_size: 3
cmp_size: 0
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-lma3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-lma3.yaml
index 74c9f0d..d3719c4 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-lma3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-lma3.yaml
@@ -10,7 +10,6 @@
image: bionic-server-cloudimg-amd64-20190612
lmas_flavor: system.compact.stacklight.server
public_net_id: public
- host_interface: 'ens3'
masters_size: 0
worker_size: 3
cmp_size: 2
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml
index 5827cb2..dd1bf98 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml
@@ -9,7 +9,6 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
- host_interface: 'ens3'
masters_size: 0
worker_size: 3
cmp_size: 2
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 645ee21..0cf85a4 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
@@ -10,7 +10,6 @@
image: bionic-server-cloudimg-amd64-20190612
lmas_flavor: system.compact.stacklight.server
public_net_id: public
- host_interface: 'ens3'
masters_size: 0
worker_size: 3
cmp_size: 2
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
index 52aa9b2..ba011e4 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
@@ -9,7 +9,6 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
- host_interface: 'ens3'
masters_size: 0
worker_size: 3
cmp_size: 2
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml
index 98e4217..c869658 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml
@@ -9,7 +9,6 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
- host_interface: 'ens3'
masters_size: 0
worker_size: 3
cmp_size: 3
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
index bb9112d..09522ec 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
@@ -9,7 +9,6 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
- host_interface: 'ens3'
masters_size: 0
worker_size: 3
cmp_size: 3
diff --git a/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml
index 0027bb2..b8f64cc 100644
--- a/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml
@@ -9,7 +9,6 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
- host_interface: 'ens3'
masters_size: 0
worker_size: 5
cmp_size: 0
diff --git a/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml
index c35ef74..5f60989 100644
--- a/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml
@@ -9,7 +9,6 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
- host_interface: 'ens3'
masters_size: 0
worker_size: 3
cmp_size: 2
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0-lma3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0-lma3.yaml
index 2620ae0..620e3a7 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0-lma3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0-lma3.yaml
@@ -10,7 +10,6 @@
image: bionic-server-cloudimg-amd64-20190612
lmas_flavor: system.compact.stacklight.server
public_net_id: public
- host_interface: 'ens3'
masters_size: 2
worker_size: 3
cmp_size: 0
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0.yaml
index ae3b3b2..607b62f 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0.yaml
@@ -6,7 +6,6 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
- host_interface: 'ens3'
masters_size: 2
worker_size: 3
cmp_size: 0
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3-osd3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3-osd3.yaml
index cb3dc1a..f33754c 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3-osd3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3-osd3.yaml
@@ -16,7 +16,6 @@
lmas_flavor: system.compact.stacklight.server
osds_flavor: system.virtual.ceph.osd
public_net_id: public
- host_interface: 'ens3'
masters_size: 2
worker_size: 3
cmp_size: 2
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3.yaml
index 167c808..9525d5f 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3.yaml
@@ -10,7 +10,6 @@
image: bionic-server-cloudimg-amd64-20190612
lmas_flavor: system.compact.stacklight.server
public_net_id: public
- host_interface: 'ens3'
masters_size: 2
worker_size: 3
cmp_size: 2
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0.yaml
index eb31703..f6875d6 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0.yaml
@@ -9,7 +9,6 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
- host_interface: 'ens3'
masters_size: 2
worker_size: 3
cmp_size: 2
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw2.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw2.yaml
index 1a5f73a..3c6e9ee 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw2.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw2.yaml
@@ -9,7 +9,6 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
- host_interface: 'ens3'
masters_size: 2
worker_size: 3
cmp_size: 2
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3-osd3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3-osd3.yaml
index e9be351..a5fcc96 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3-osd3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3-osd3.yaml
@@ -16,7 +16,6 @@
lmas_flavor: system.compact.stacklight.server
osds_flavor: system.virtual.ceph.osd
public_net_id: public
- host_interface: 'ens3'
masters_size: 2
worker_size: 3
cmp_size: 2
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml
index 50dcd10..21f85c3 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml
@@ -9,7 +9,6 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
- host_interface: 'ens3'
masters_size: 2
worker_size: 3
cmp_size: 2
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 e888cad..1467ac0 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
@@ -16,7 +16,6 @@
osds_flavor: system.virtual.ceph.osd
ntws_flavor: system.compact.opencontrail.control
public_net_id: public
- host_interface: 'ens3'
masters_size: 2
worker_size: 3
cmp_size: 2
diff --git a/de/heat-templates/env/mstr3-wrkr6-cmp3-osd3.yaml b/de/heat-templates/env/mstr3-wrkr6-cmp3-osd3.yaml
index f09a354..5e5edeb 100644
--- a/de/heat-templates/env/mstr3-wrkr6-cmp3-osd3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr6-cmp3-osd3.yaml
@@ -16,7 +16,6 @@
lmas_flavor: system.compact.stacklight.server
osds_flavor: system.virtual.ceph.osd
public_net_id: public
- host_interface: 'ens3'
masters_size: 2
worker_size: 6
cmp_size: 3
diff --git a/de/heat-templates/env/telco.yaml b/de/heat-templates/env/telco.yaml
index 1a5f73a..3c6e9ee 100644
--- a/de/heat-templates/env/telco.yaml
+++ b/de/heat-templates/env/telco.yaml
@@ -9,7 +9,6 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
- host_interface: 'ens3'
masters_size: 2
worker_size: 3
cmp_size: 2