Merge lp:~josvaz/vmbuilder/jenkins_kvm+ethx-fixed into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Jose L. VG]

Fix 768-770 commits adding eth1+ udev support

Commits 768-770 added udev support for eth1+ DHCP configuration for xenial onward.

They had a bug and were reverted. This is a fixed version of those commits. The problem was the xchrooted command at line had an incorrect prefix on, a path already chrooted.

[Jose L. VG (josvaz)]

Lines fixed

91 + # Make the script executable
92 + xchroot chmod +x /usr/local/sbin/ephemeral_eth.sh

Was:

91 + # Make the script executable
92 + xchroot chmod +x ${mp}/usr/local/sbin/ephemeral_eth.sh

[Robert C Jennings (rcj)]

it would be easier now and for future reviewers to have two commits. Commit #1 re-reverts r771, Commit #2 fixes the issue.

review: Needs Fixing

[Jose L. VG (josvaz)]

Done, please review again

[Robert C Jennings (rcj)]

Excellent and thank you for splitting out the fix from the revert. Merge when ready

review: Approve

[lp:~josvaz/vmbuilder/jenkins_kvm+ethx-fixed]

771. By Jose L. VG on 2016-10-27

Re-reverts 771

772. By Jose L. VG on 2016-10-27

Fix 768-770 commits adding eth1+ udev support

Commits 768-770 added udev support for eth1+ DHCP configuration for
xenial onward.

They had a bug and were reverted. This is the fix:
The xchrooted command had a prefix on, a path already chrooted!

=== modified file 'templates/img-extra-nets.tmpl'
--- templates/img-extra-nets.tmpl	2016-10-20 13:39:46 +0000
+++ templates/img-extra-nets.tmpl	2016-10-27 15:59:51 +0000
@@ -1,29 +1,17 @@
 ######################
 ## 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="/etc/network/interfaces.dynamic.d"
+int_d="/run/network/interfaces.ephemeral.d/"
 xchroot mkdir -p ${int_d}
 
-## 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
+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
 ${CLOUD_IMG_STR}
 
 description "Dynamically populate ${int_d}"
@@ -50,15 +38,65 @@
     esac
 end script
 EOF
-
-# Add an ephemeral mount for holding additional NIC interfaces
-cat << EOF >> ${mp}/etc/fstab
-
+}
+
+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
 ${CLOUD_IMG_STR}
-# 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
+# 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 /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
 
 # Add the network ephemeral mount...
 cat << EOF >> ${mp}/etc/network/interfaces