[DCAE-27] Ensure eth1 comes up on Ubuntu 14.04

Change-Id: I96c47d4c9997e4eae96f912c9af40f0b218d0c5c
Signed-off-by: Carsten Lund <lund@research.att.com>

diff --git a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
index a375f45..160ed66 100644 (file)
--- a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
@@ -27,6 +27,9 @@ installation-steps:
 
 - step: shell
   command: |
+    echo auto eth1 >> /etc/network/interfaces
+    echo iface eth1 inet dhcp >> /etc/network/interfaces
+    ifup eth1
     apt-get update ; apt-get install -y maven openjdk-7-jdk unzip python-pip
     pip install pyyaml
   application-id: root

diff --git a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
index 15fefff..e9c34cd 100644 (file)
--- a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
@@ -20,12 +20,11 @@ installation-steps:
 
 - step: shell
   command: |
-    case \\\\\$(hostname -a) in
-      *openecomp.org*)
-        sed -i /`hostname`/d /etc/hosts
-        cat /tmp/vm-*-hosts >> /etc/hosts
-      ;;
-    esac
+    sed -i /`hostname`/d /etc/hosts
+    cat /tmp/vm-*-hosts >> /etc/hosts
+    echo auto eth1 >> /etc/network/interfaces
+    echo iface eth1 inet dhcp >> /etc/network/interfaces
+    ifup eth1
     apt-get update ; apt-get install -y maven openjdk-7-jdk unzip python-pip
     pip install libyaml
   application-id: root