commit 699074a288b1a105f57ac8d49a896d59733658ae
author Jakub Pavlik <pavlk.jakub@gmail.com> Thu Jun 29 09:15:47 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Thu Jun 29 09:15:50 2017 +0000
tree c662f76b40a8ebf2af80c0ffd09dab4adb0e4f19
parent 91d4ac335c129acd9ef5d3093151bb0c07af3ba3
parent b46cd7263d2dd3e11a3623ebb735c287747de67f

Merge "Fix network configuration in contrail labs"

classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml

diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml
index 9a7b4a4..51217c4 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml
@@ -31,6 +31,9 @@
     linux_system_codename: xenial
   linux:
     network:
+      concat_iface_files:
+      - src: '/etc/network/interfaces.d/50-cloud-init.cfg'
+        dst: '/etc/network/interfaces'
       interface:
         ens4:
           enabled: true

classes/cluster/virtual-mcp11-contrail/openstack/compute.yml

diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml b/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
index b1bd93c..967d151 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
@@ -26,6 +26,9 @@
     linux_system_codename: xenial
   linux:
     network:
+      concat_iface_files:
+      - src: '/etc/network/interfaces.d/50-cloud-init.cfg'
+        dst: '/etc/network/interfaces'
       interface:
         ens4:
           enabled: true