3 files changed, 0 insertions, 62 deletions
diff --git a/debian/patches/ipv6-config b/debian/patches/ipv6-config
deleted file mode 100644
index b6303e04..00000000
--- a/debian/patches/ipv6-config
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/cloudinit/net/cmdline.py
-+++ b/cloudinit/net/cmdline.py
-@@ -86,7 +86,7 @@
-         else:
-             proto = 'static'
- 
--    if proto not in ('static', 'dhcp'):
-+    if proto not in ('static', 'dhcp', 'dhcp6'):
-         raise ValueError("Unexpected value for PROTO: %s" % proto)
- 
-     iface = {
-@@ -98,12 +98,15 @@
-     if name in mac_addrs:
-         iface['mac_address'] = mac_addrs[name]
- 
--    # originally believed there might be IPV6* values
--    for v, pre in (('ipv4', 'IPV4'),):
-+    # Handle both IPv4 and IPv6 values
-+    for v, pre in (('ipv4', 'IPV4'), ('ipv6', 'IPV6')):
-         # if no IPV4ADDR or IPV6ADDR, then go on.
-         if pre + "ADDR" not in data:
-             continue
--        subnet = {'type': proto, 'control': 'manual'}
-+        if pre + "PROTO" in data:
-+            subnet = {'type': data[pre + 'PROTO'], 'control': 'manual'}
-+        else:
-+            subnet = {'type': proto, 'control': 'manual'}
- 
-         # these fields go right on the subnet
-         for key in ('NETMASK', 'BROADCAST', 'GATEWAY'):
diff --git a/debian/patches/ntp-move-to-run-after-apt-configuration.patch b/debian/patches/ntp-move-to-run-after-apt-configuration.patch
deleted file mode 100644
index e25bc014..00000000
--- a/debian/patches/ntp-move-to-run-after-apt-configuration.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6d1edc3f5a18b328bdd307426056539d5b9071fd Mon Sep 17 00:00:00 2001
-From: Scott Moser <smoser@brickies.net>
-Date: Wed, 28 Sep 2016 12:07:26 -0400
-Subject: [PATCH] ntp: move to run after apt configuration
-
-since ntp module may try to install packages, it needs to run after
-apt is configured.
-
-LP: #1628337
----
- config/cloud.cfg | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/config/cloud.cfg
-+++ b/config/cloud.cfg
-@@ -45,13 +45,13 @@ cloud_config_modules:
-  - emit_upstart
-  - disk_setup
-  - mounts
-- - ntp
-  - ssh-import-id
-  - locale
-  - set-passwords
-  - grub-dpkg
-  - apt-pipelining
-  - apt-configure
-+ - ntp
-  - timezone
-  - disable-ec2-metadata
-  - runcmd
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c93c18ac..00000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-ipv6-config
-ntp-move-to-run-after-apt-configuration.patch