Merge lp:~fginther/vmbuilder/jenkins_kvm-ci-wa-all into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Francis Ginther]

Add cloud-init multi-nic workaround for SF Case #222480 (add for 16.04, 18.10, 19.04)

When adding network devices after first boot, network configuration
data is not created and the devices are unusable.

This workaround creates a systemd drop-in file to clear out the
cloud-init persistent object forcing cloud-init to perform network
discovery on each boot.

This is the same fix as https://code.launchpad.net/~cloudware/vmbuilder/jenkins_kvm-fginther/+merge/366182 applied to the other active releases except trusty (which uses an older cloud-init).

[Tobias Koch (tobijk)]

review: Approve

[David Krauser (davidkrauser)]

review: Approve

=== modified file 'templates/img-azure-16.04-addin.tmpl'
--- templates/img-azure-16.04-addin.tmpl	2017-10-16 21:01:28 +0000
+++ templates/img-azure-16.04-addin.tmpl	2019-04-24 13:15:34 +0000
@@ -48,6 +48,16 @@
 
 EOF
 
+# Apply a workaround for adding multiple NICs (SF Case #222480)
+# This clears cloud-init's persistent network object, forcing network
+# rediscovery on each boot (which correctly finds NICs added after VM creation)
+mkdir -p "${mp}/lib/systemd/system/cloud-init-local.service.d"
+cat << EOF > "${mp}/lib/systemd/system/cloud-init-local.service.d/50-azure-clear-persistent-obj-pkl.conf"
+[Service]                                                               
+ExecStartPre=-/bin/sh -xc 'if [ -e /var/lib/cloud/instance/obj.pkl ]; then echo "cleaning persistent cloud-init object"; rm /var/lib/cloud/instance/obj.pkl; fi; exit 0'
+EOF
+
+
 # Frame buffer fix
 cat << EOF >> "${mp}/etc/initramfs-tools/modules"
 
 
=== modified file 'templates/img-azure-18.10-addin.tmpl'
--- templates/img-azure-18.10-addin.tmpl	2019-03-26 17:12:13 +0000
+++ templates/img-azure-18.10-addin.tmpl	2019-04-24 13:15:34 +0000
@@ -47,6 +47,15 @@
          security: http://ports.ubuntu.com/ubuntu-ports
 EOF
 
+# Apply a workaround for adding multiple NICs (SF Case #222480)
+# This clears cloud-init's persistent network object, forcing network
+# rediscovery on each boot (which correctly finds NICs added after VM creation)
+mkdir -p "${mp}/lib/systemd/system/cloud-init-local.service.d"
+cat << EOF > "${mp}/lib/systemd/system/cloud-init-local.service.d/50-azure-clear-persistent-obj-pkl.conf"
+[Service]                                                               
+ExecStartPre=-/bin/sh -xc 'if [ -e /var/lib/cloud/instance/obj.pkl ]; then echo "cleaning persistent cloud-init object"; rm /var/lib/cloud/instance/obj.pkl; fi; exit 0'
+EOF
+
 # Frame buffer fix
 cat << EOF >> "${mp}/etc/initramfs-tools/modules"
 
 
=== modified file 'templates/img-azure-19.04-addin.tmpl'
--- templates/img-azure-19.04-addin.tmpl	2018-10-25 10:52:01 +0000
+++ templates/img-azure-19.04-addin.tmpl	2019-04-24 13:15:34 +0000
@@ -48,6 +48,15 @@
 
 EOF
 
+# Apply a workaround for adding multiple NICs (SF Case #222480)
+# This clears cloud-init's persistent network object, forcing network
+# rediscovery on each boot (which correctly finds NICs added after VM creation)
+mkdir -p "${mp}/lib/systemd/system/cloud-init-local.service.d"
+cat << EOF > "${mp}/lib/systemd/system/cloud-init-local.service.d/50-azure-clear-persistent-obj-pkl.conf"
+[Service]                                                               
+ExecStartPre=-/bin/sh -xc 'if [ -e /var/lib/cloud/instance/obj.pkl ]; then echo "cleaning persistent cloud-init object"; rm /var/lib/cloud/instance/obj.pkl; fi; exit 0'
+EOF
+
 # Frame buffer fix
 cat << EOF >> "${mp}/etc/initramfs-tools/modules"