diff options
| author | Chad Smith <chad.smith@canonical.com> | 2018-10-17 13:06:14 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-10-17 13:28:13 -0600 |
| commit | 833adcdf6f85ec2305e62bea5a20f9363bf95507 (patch) | |
| tree | 8d907ceb0967a4b906e008303b8c0eadaedf71b1 | |
| parent | 85452d3f01f2e68c6159f0a603a73eedcd36e6b4 (diff) | |
| download | cloud-init-git-833adcdf6f85ec2305e62bea5a20f9363bf95507.tar.gz | |
add azure-apply-network-config-false.patch to patches/seriesubuntu/18.4-0ubuntu1_16.04.2
| -rw-r--r-- | debian/patches/azure-apply-network-config-false.patch | 23 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/debian/patches/azure-apply-network-config-false.patch b/debian/patches/azure-apply-network-config-false.patch new file mode 100644 index 00000000..281c19c6 --- /dev/null +++ b/debian/patches/azure-apply-network-config-false.patch @@ -0,0 +1,23 @@ +Description: Azure apply_network_config default to False + Azure cloud-images on Xenial already contain hotplug network scripts so + default behavior for should remain to only generate fallback network + configuration which is to dhcp on eth0 and let image hotplug scripts add + network configuration for any additional nics that show up. +Author: Chad Smith <chad.smith@canonical.com> +Origin: backport +Bug: https://bugs.launchpad.net/cloud-init/+bug/1798424 +Forwarded: not-needed +Last-Update: 2018-10-17 +Index: cloud-init/cloudinit/sources/DataSourceAzure.py +=================================================================== +--- cloud-init.orig/cloudinit/sources/DataSourceAzure.py ++++ cloud-init/cloudinit/sources/DataSourceAzure.py +@@ -207,7 +207,7 @@ BUILTIN_DS_CONFIG = { + }, + 'disk_aliases': {'ephemeral0': RESOURCE_DISK_PATH}, + 'dhclient_lease_file': LEASE_FILE, +- 'apply_network_config': True, # Use IMDS published network configuration ++ 'apply_network_config': False, # Use fallback network config not IMDS + } + # RELEASE_BLOCKER: Xenial and earlier apply_network_config default is False + diff --git a/debian/patches/series b/debian/patches/series index 44c54292..0e264119 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ ds-identify-behavior-xenial.patch stable-release-no-jsonschema-dep.patch openstack-no-network-config.patch cpick-1d5e9aef-azure-Add-apply_network_config-option-to-disable +azure-apply-network-config-false.patch |