diff options
| author | Alberto Contreras <alberto.contreras@canonical.com> | 2023-03-03 10:02:06 +0100 |
|---|---|---|
| committer | Alberto Contreras <alberto.contreras@canonical.com> | 2023-03-03 17:25:44 +0100 |
| commit | ac410878f365caaf496ee75e87d0075a71272249 (patch) | |
| tree | 663cc5cd38b067957d995bd6b486ca05c4d24f33 | |
| parent | 8ad977b1bebeb799d6cd317c5a5db156e5fedf02 (diff) | |
| download | cloud-init-git-ac410878f365caaf496ee75e87d0075a71272249.tar.gz | |
refresh patches against 23.1.1
patches:
debian/patches/netplan99-cannot-use-default.patch
debian/patches/openstack-no-network-config.patch
| -rw-r--r-- | debian/patches/netplan99-cannot-use-default.patch | 18 | ||||
| -rw-r--r-- | debian/patches/openstack-no-network-config.patch | 6 |
2 files changed, 9 insertions, 15 deletions
diff --git a/debian/patches/netplan99-cannot-use-default.patch b/debian/patches/netplan99-cannot-use-default.patch index c164cccf..332f4d24 100644 --- a/debian/patches/netplan99-cannot-use-default.patch +++ b/debian/patches/netplan99-cannot-use-default.patch @@ -8,10 +8,8 @@ Forwarded: not-needed Last-Update: 2023-02-27 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: b/cloudinit/net/netplan.py -=================================================================== ---- a/cloudinit/net/netplan.py 2023-02-27 20:40:42.534650863 +0100 -+++ b/cloudinit/net/netplan.py 2023-02-27 20:40:42.514650609 +0100 +--- a/cloudinit/net/netplan.py ++++ b/cloudinit/net/netplan.py @@ -119,7 +119,7 @@ def _extract_addresses(config: dict, ent if subnet.get("gateway"): new_route = { @@ -21,10 +19,8 @@ Index: b/cloudinit/net/netplan.py } try: subnet_gateway = ipaddress.ip_address(subnet["gateway"]) -Index: b/tests/unittests/test_net.py -=================================================================== ---- a/tests/unittests/test_net.py 2023-02-27 20:40:42.534650863 +0100 -+++ b/tests/unittests/test_net.py 2023-02-27 20:40:42.522650711 +0100 +--- a/tests/unittests/test_net.py ++++ b/tests/unittests/test_net.py @@ -403,7 +403,7 @@ network: transmit-hash-policy: layer3+4 up-delay: 0 @@ -140,10 +136,8 @@ Index: b/tests/unittests/test_net.py via: 2001:ffff::1 on-link: true set-name: interface0 -Index: b/tests/unittests/distros/test_netconfig.py -=================================================================== ---- a/tests/unittests/distros/test_netconfig.py 2023-02-27 20:40:42.534650863 +0100 -+++ b/tests/unittests/distros/test_netconfig.py 2023-02-27 20:40:42.522650711 +0100 +--- a/tests/unittests/distros/test_netconfig.py ++++ b/tests/unittests/distros/test_netconfig.py @@ -199,7 +199,7 @@ network: addresses: - 192.168.1.5/24 diff --git a/debian/patches/openstack-no-network-config.patch b/debian/patches/openstack-no-network-config.patch index 52cd1d87..a571b561 100644 --- a/debian/patches/openstack-no-network-config.patch +++ b/debian/patches/openstack-no-network-config.patch @@ -15,7 +15,7 @@ Author: Chad Smith <chad.smith@canonical.com> --- a/cloudinit/sources/DataSourceOpenStack.py +++ b/cloudinit/sources/DataSourceOpenStack.py -@@ -131,10 +131,11 @@ class DataSourceOpenStack(openstack.Sour +@@ -124,10 +124,11 @@ class DataSourceOpenStack(openstack.Sour if self._network_config != sources.UNSET: return self._network_config @@ -31,7 +31,7 @@ Author: Chad Smith <chad.smith@canonical.com> if self.network_json == sources.UNSET: --- a/tests/unittests/sources/test_openstack.py +++ b/tests/unittests/sources/test_openstack.py -@@ -423,7 +423,6 @@ class TestOpenStackDataSource(test_helpe +@@ -422,7 +422,6 @@ class TestOpenStackDataSource(test_helpe ds_os = ds.DataSourceOpenStack( settings.CFG_BUILTIN, None, helpers.Paths({"run_dir": self.tmp}) ) @@ -39,7 +39,7 @@ Author: Chad Smith <chad.smith@canonical.com> sample_json = { "links": [{"ethernet_mac_address": "mymac"}], "networks": [], -@@ -447,6 +446,7 @@ class TestOpenStackDataSource(test_helpe +@@ -446,6 +445,7 @@ class TestOpenStackDataSource(test_helpe "services": [], } ds_os.network_json = sample_json |