commit 4f019781dc610e0fad9418846fdc410eaff068fb
author Jan Cach <cach.jan@gmail.com> Thu Oct 11 16:09:34 2018 +0200
committer Jan Cach <cach.jan@gmail.com> Thu Oct 11 16:10:42 2018 +0200
tree b19fa7b7d9ff21ea192214f15827284e96367054
parent 793dbd140135c37160c25f9d0f3e9effaee5c26e

Set mgmt interfaces to dhcp in contrail-labs

Closes-bug: #PROD-23882

Change-Id: I0d9faa34f92d4e771e28a7fe7e9ab1e33f3990ff

classes/cluster/os-ha-contrail-40/infra/init.yml

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

classes/cluster/os-ha-contrail-40/opencontrail/control.yml

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:

classes/cluster/os-ha-contrail-40/openstack/compute.yml

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

classes/cluster/os-ha-contrail-40/openstack/control.yml

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