Set mgmt interfaces to dhcp in contrail-labs
Closes-bug: #PROD-23882
Change-Id: I0d9faa34f92d4e771e28a7fe7e9ab1e33f3990ff
diff --git a/classes/cluster/os-ha-contrail-40/infra/init.yml b/classes/cluster/os-ha-contrail-40/infra/init.yml
index eafd3c6..f8009ef 100644
--- a/classes/cluster/os-ha-contrail-40/infra/init.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/init.yml
@@ -6,3 +6,7 @@
infra_config_address: 172.16.10.100
infra_config_hostname: cfg01
linux_system_repo_mcp_salt_version: nightly
+ linux_dhcp_interface:
+ enabled: true
+ type: eth
+ proto: dhcp
diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
index c8ac4f5..807043a 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
@@ -36,12 +36,14 @@
network:
interface:
iface:
- enabled: true
- name: ${_param:opencontrail_control_interface_name}
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
+ eth3: ${_param:linux_dhcp_interface}
+ eth4:
+ enabled: true
+ name: ${_param:opencontrail_control_interface_name}
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
keepalived:
cluster:
instance:
diff --git a/classes/cluster/os-ha-contrail-40/openstack/compute.yml b/classes/cluster/os-ha-contrail-40/openstack/compute.yml
index 4dc427e..734885f 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/compute.yml
@@ -36,6 +36,7 @@
- src: '/etc/network/interfaces.d/50-cloud-init.cfg'
dst: '/etc/network/interfaces'
interface:
+ ens3: ${_param:linux_dhcp_interface}
ens4:
enabled: true
ipflush_onchange: true
diff --git a/classes/cluster/os-ha-contrail-40/openstack/control.yml b/classes/cluster/os-ha-contrail-40/openstack/control.yml
index 424e2bf..0234048 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/control.yml
@@ -49,6 +49,7 @@
version: latest
network:
interface:
+ ens3: ${_param:linux_dhcp_interface}
ens4:
enabled: true
type: eth
diff --git a/classes/cluster/os-ha-contrail/infra/init.yml b/classes/cluster/os-ha-contrail/infra/init.yml
index b54cf03..99a06af 100755
--- a/classes/cluster/os-ha-contrail/infra/init.yml
+++ b/classes/cluster/os-ha-contrail/infra/init.yml
@@ -6,3 +6,7 @@
infra_config_address: 172.16.10.100
infra_config_hostname: cfg01
linux_system_repo_mcp_salt_version: nightly
+ linux_dhcp_interface:
+ enabled: true
+ type: eth
+ proto: dhcp
diff --git a/classes/cluster/os-ha-contrail/opencontrail/control.yml b/classes/cluster/os-ha-contrail/opencontrail/control.yml
index 4dff206..22eca9c 100644
--- a/classes/cluster/os-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail/opencontrail/control.yml
@@ -35,6 +35,7 @@
linux:
network:
interface:
+ eth0: ${_param:linux_dhcp_interface}
eth1:
enabled: true
type: eth
diff --git a/classes/cluster/os-ha-contrail/openstack/compute.yml b/classes/cluster/os-ha-contrail/openstack/compute.yml
index 0467c74..02216b9 100755
--- a/classes/cluster/os-ha-contrail/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail/openstack/compute.yml
@@ -38,6 +38,7 @@
- src: '/etc/network/interfaces.d/50-cloud-init.cfg'
dst: '/etc/network/interfaces'
interface:
+ ens3: ${_param:linux_dhcp_interface}
ens4:
enabled: true
ipflush_onchange: true
diff --git a/classes/cluster/os-ha-contrail/openstack/control.yml b/classes/cluster/os-ha-contrail/openstack/control.yml
index 51bf18d..5d853ed 100755
--- a/classes/cluster/os-ha-contrail/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail/openstack/control.yml
@@ -51,6 +51,7 @@
version: latest
network:
interface:
+ ens3: ${_param:linux_dhcp_interface}
ens4:
enabled: true
type: eth