Merge lp:~josvaz/vmbuilder/jenkins_kvm-revert-eth1+ into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Jose L. VG]

Revert eth1+ fix as its breaking builds

Need to debug before reshipping it.

[Robert C Jennings (rcj)]

Looks like it takes us back to the prior state. Merging.

review: Approve

[Jose L. VG (josvaz)]

this was created by bzr revert -r 767 so it should be all automatic an safe

767 reads
767. By Robert C Jennings on 2016-10-06
Enable trace output for MAAS v3 builder

and is the last commit before eth1+ changes

=== modified file 'templates/img-extra-nets.tmpl'
--- templates/img-extra-nets.tmpl	2016-10-18 14:50:58 +0000
+++ templates/img-extra-nets.tmpl	2016-10-20 13:40:57 +0000
@@ -1,17 +1,29 @@
 ######################
 ## BEGIN NICS
 ## This adds upstart jobs for the creation of hot-plug NICS
-## For xenial onward, udev is configured instead
 # vi: ts=4 noexpandtab syntax=sh
 
-int_d="/run/network/interfaces.ephemeral.d/"
+int_d="/etc/network/interfaces.dynamic.d"
 xchroot mkdir -p ${int_d}
 
-function config_upstart {
-    # Give an upstart job for defining a secondary interface
-    # if needed.
-    cat << EOF > ${mp}/etc/init/network-conf-ethX.conf
-# Enable DHCP configuration for eth1+ devices as they appear
+## Place readme to notify people what is going on
+cat << EOF > ${mp}${int_d}/README
+WARNING: This is mounted over during boot!
+
+If you are seeing this file, it means that you have disabled the tmpfs mount
+   in /etc/fstab for ${int_d}. Therefore, this directory
+   is ephemeral.
+
+This directory is normally populated at boot for any interface that is not
+    eth0 with a dynamic configuration.
+
+${CLOUD_IMG_STR}
+EOF
+
+# Give an upstart job for defining a secondary interface
+# if needed.
+cat << EOF > ${mp}/etc/init/network-conf-ethX.conf
+# Enable DHCP configuration for additional ethX devices
 ${CLOUD_IMG_STR}
 
 description "Dynamically populate ${int_d}"
@@ -38,65 +50,15 @@
     esac
 end script
 EOF
-}
-
-function config_udev {
-    # Give a udev script to define eth1+ interfaces, as they appear
-    cat << EOF > ${mp}/usr/local/sbin/ephemeral_eth.sh
-#!/bin/bash
+
+# Add an ephemeral mount for holding additional NIC interfaces
+cat << EOF >> ${mp}/etc/fstab
+
 ${CLOUD_IMG_STR}
-# Enable DHCP configuration for ethx devices other than eth0
-# Called by udev to define eth1+ interfaces, as they appear
-
-INTERFACE=\$1
-net_int_d="${int_d}"
-
-function configure_nic {
-    # Ensure \${net_int_d} exists on the ephemeral mount
-    mkdir -p \${net_int_d}
-
-    # Setup the interface config file
-    cat << EOM > \${net_int_d}/\${INTERFACE}.cfg
-# Added by \$0
-allow-hotplug \${INTERFACE}
-iface \${INTERFACE} inet dhcp
-EOM
-
-    # Bring the interface up
-    /sbin/ifup \${INTERFACE}
-}
-
-case \${INTERFACE} in
-    eth0) #skip, this is static
-        ;;
-    eth*)
-        if [ ! -e \${net_int_d}/\${INTERFACE}.cfg ]
-        then
-            configure_nic
-        fi
-        ;;
-    *)
-        ;;
-esac
-EOF
-    # Make the script executable
-    xchroot chmod +x ${mp}/usr/local/sbin/ephemeral_eth.sh 
-
-    # Place an udev rule to call the script when an net device is added
-    cat << EOF > ${mp}/etc/udev/rules.d/10-net-device-added.rules
-# Run /usr/local/sbin/ephemeral_eth.sh every time a network device is added
-ACTION=="add", SUBSYSTEM=="net", KERNEL=="eth[0-9]*", PROGRAM="/usr/local/sbin/ephemeral_eth.sh %k"
-EOF
-}
-
-case ${SUITE} in
-    precise|trusty)
-        config_upstart
-        ;;
-    *)
-        config_udev
-        ;;
-esac
+# The following is used to dynamically configured additional
+# NICs. Do not remove unless you know what you are doing.
+none ${int_d} tmpfs   nodev,noexec,nosuid,size=64K 0 0
+EOF
 
 # Add the network ephemeral mount...
 cat << EOF >> ${mp}/etc/network/interfaces