Merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-oddbloke into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Dan Watkins]

[Steve Langasek (vorlon)]

Called out in https://bugs.launchpad.net/lansing/+bug/1711406/comments/3 that this changes behavior for non-SRIOV instances as well.

[Steve Langasek (vorlon)]

review: Needs Information

[Dan Watkins (oddbloke)]

On Wed, Aug 23, 2017 at 12:39:29AM -0000, Steve Langasek wrote:
> This is the driver used on Azure and is hyperv-specific. It is a backwards-compatible change *only* on Azure; on all other clouds, this will disable dhcp on supplementary interfaces. Is this code used in any other images currently besides Azure? The only reference to it is in azure_config.sh, so maybe we're in the clear.

The code is cargo-culted to other cloud build scripts, but I don't
believe that this is re-used anywhere.

[Philip Roche (philroche)]

+1. Appears to do what is intended

review: Approve

[Steve Langasek (vorlon)]

review: Approve

[Francis Ginther (fginther)]

MSFT has approved this change (see https://bugs.launchpad.net/lansing/+bug/1711406/comments/10).

[lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-oddbloke]

788. By Francis Ginther on 2017-09-14

Only perform DHCP on hv_netvsc interfaces on Azure (LP: #1711406)
[a=daniel-thewatkins][r=vorlon,philroche]

MP: https://code.launchpad.net/~ubuntu-on-ec2/vmbuilder/jenkins_kvm-oddbloke/+merge/329385

=== modified file 'templates/img-extra-nets.tmpl'
--- templates/img-extra-nets.tmpl	2016-11-15 10:03:57 +0000
+++ templates/img-extra-nets.tmpl	2017-08-22 19:42:19 +0000
@@ -84,7 +84,7 @@
     # 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[1-9]*", RUN="/usr/local/sbin/ephemeral_eth.sh %k"
+ACTION=="add", SUBSYSTEM=="net", DRIVERS=="hv_netvsc", KERNEL=="eth[1-9]*", RUN="/usr/local/sbin/ephemeral_eth.sh %k"
 EOF
 }