Thomas Stringer has proposed merging ~trstringer/cloud-init:thstring/remove-waagent-patch-xenial into cloud-init:ubuntu/xenial.
Requested reviews: cloud-init Commiters (cloud-init-dev) For more details, see: https://code.launchpad.net/~trstringer/cloud-init/+git/cloud-init/+merge/375217 This merge request removes the patch from the Xenial branch that alters cloud-init to speak with the fabric through waagent. By removing this patch, it will now use the builtin functionality for fabric negotiation. -- Your team cloud-init Commiters is requested to review the proposed merge of ~trstringer/cloud-init:thstring/remove-waagent-patch-xenial into cloud-init:ubuntu/xenial.
diff --git a/debian/patches/azure-use-walinux-agent.patch b/debian/patches/azure-use-walinux-agent.patch deleted file mode 100644 index 3e9ddd9..0000000 --- a/debian/patches/azure-use-walinux-agent.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Use walinux-agent rather than builtin fabric support - Upstream now uses the built-in support for instance initialization on Azure. - On a stable release, we want to continue to use the walinux-agent integration. - Upstream made this change under bug 1538522. -Forwarded: not-needed -Author: Scott Moser <smo...@ubuntu.com> ---- a/cloudinit/sources/DataSourceAzure.py -+++ b/cloudinit/sources/DataSourceAzure.py -@@ -214,7 +214,7 @@ if util.is_FreeBSD(): - PLATFORM_ENTROPY_SOURCE = None - - BUILTIN_DS_CONFIG = { -- 'agent_command': AGENT_START_BUILTIN, -+ 'agent_command': AGENT_START, - 'data_dir': AGENT_SEED_DIR, - 'set_hostname': True, - 'hostname_bounce': { diff --git a/debian/patches/series b/debian/patches/series index 5d6995e..77d1b2a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -azure-use-walinux-agent.patch ds-identify-behavior-xenial.patch stable-release-no-jsonschema-dep.patch openstack-no-network-config.patch
_______________________________________________ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp