diff options
| author | zsdc <taras@vyos.io> | 2020-03-11 21:20:58 +0200 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2020-03-11 21:22:23 +0200 |
| commit | c6627bc05a57645e6af8b9a5a67e452d9f37e487 (patch) | |
| tree | b754b3991e5e57a9ae9155819f73fa0cbd4be269 /debian/patches/azure-apply-network-config-false.patch | |
| parent | ca9a4eb26b41c204d1bd3a15586b14a5dde950bb (diff) | |
| parent | 13e82554728b1cb524438163784e5b955c7c5ed0 (diff) | |
| download | vyos-cloud-init-c6627bc05a57645e6af8b9a5a67e452d9f37e487.tar.gz vyos-cloud-init-c6627bc05a57645e6af8b9a5a67e452d9f37e487.zip | |
Cloud-init: T2117: Updated to 20.1
- Merge 20.1 version from the Canonical repository
- Removed unneeded changes in datasources (now only OVF datasource is not equal to upstream's version)
- Adapted cc_vyos module to new Cloud-init version
- Changed Jenkinsfile to use build scripts, provided by upstream
Diffstat (limited to 'debian/patches/azure-apply-network-config-false.patch')
| -rw-r--r-- | debian/patches/azure-apply-network-config-false.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/debian/patches/azure-apply-network-config-false.patch b/debian/patches/azure-apply-network-config-false.patch deleted file mode 100644 index 281c19c6..00000000 --- a/debian/patches/azure-apply-network-config-false.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 - |