diff options
author | Alberto Contreras <alberto.contreras@canonical.com> | 2023-02-24 12:57:32 +0100 |
---|---|---|
committer | Alberto Contreras <alberto.contreras@canonical.com> | 2023-02-27 17:56:37 +0100 |
commit | 8de621885f65205f7c6ffdeee54b1e43170f8f79 (patch) | |
tree | 59b19cc03b8838d5a4f0e769e5b6c4b5ba1e425c | |
parent | a0a0e031549de1c7b237147437a9ef0935239a4d (diff) | |
download | cloud-init-git-8de621885f65205f7c6ffdeee54b1e43170f8f79.tar.gz |
refresh patches against 23.1
patches:
debian/patches/ec2-dont-apply-full-imds-network-config.patch
debian/patches/openstack-no-network-config.patch
debian/patches/renderer-do-not-prefer-netplan.patch
debian/patches/retain-netplan-world-readable.patch
4 files changed, 11 insertions, 15 deletions
diff --git a/debian/patches/ec2-dont-apply-full-imds-network-config.patch b/debian/patches/ec2-dont-apply-full-imds-network-config.patch index 4267b364..14886322 100644 --- a/debian/patches/ec2-dont-apply-full-imds-network-config.patch +++ b/debian/patches/ec2-dont-apply-full-imds-network-config.patch @@ -9,7 +9,7 @@ Forwarded: not-needed Last-Update: 2020-06-01 --- a/cloudinit/sources/DataSourceEc2.py +++ b/cloudinit/sources/DataSourceEc2.py -@@ -473,12 +473,12 @@ class DataSourceEc2(sources.DataSource): +@@ -506,12 +506,12 @@ class DataSourceEc2(sources.DataSource): if isinstance(net_md, dict): # SRU_BLOCKER: xenial, bionic and eoan should default # apply_full_imds_network_config to False to retain original @@ -26,7 +26,7 @@ Last-Update: 2020-06-01 --- a/tests/unittests/sources/test_ec2.py +++ b/tests/unittests/sources/test_ec2.py -@@ -476,7 +476,14 @@ class TestEc2(test_helpers.HttprettyTest +@@ -492,7 +492,14 @@ class TestEc2(test_helpers.ResponsesTest """ ds = self._setup_ds( platform_data=self.valid_platform_data, diff --git a/debian/patches/openstack-no-network-config.patch b/debian/patches/openstack-no-network-config.patch index a476072a..52cd1d87 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 -@@ -118,10 +118,11 @@ class DataSourceOpenStack(openstack.Sour +@@ -131,10 +131,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 -@@ -373,7 +373,6 @@ class TestOpenStackDataSource(test_helpe +@@ -423,7 +423,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": [], -@@ -397,6 +396,7 @@ class TestOpenStackDataSource(test_helpe +@@ -447,6 +446,7 @@ class TestOpenStackDataSource(test_helpe "services": [], } ds_os.network_json = sample_json diff --git a/debian/patches/renderer-do-not-prefer-netplan.patch b/debian/patches/renderer-do-not-prefer-netplan.patch index 42603b8c..1f440b3d 100644 --- a/debian/patches/renderer-do-not-prefer-netplan.patch +++ b/debian/patches/renderer-do-not-prefer-netplan.patch @@ -7,7 +7,7 @@ Forwarded: not-needed Last-Update: 2020-06-01 --- a/config/cloud.cfg.tmpl +++ b/config/cloud.cfg.tmpl -@@ -216,10 +216,7 @@ system_info: +@@ -218,10 +218,7 @@ system_info: groups: [adm, audio, cdrom, dialout, dip, floppy, lxd, netdev, plugdev, sudo, video] sudo: ["ALL=(ALL) NOPASSWD:ALL"] shell: /bin/bash @@ -21,7 +21,7 @@ Last-Update: 2020-06-01 # Other config here will be given to the distro class and/or path classes --- a/tests/unittests/test_render_cloudcfg.py +++ b/tests/unittests/test_render_cloudcfg.py -@@ -80,7 +80,6 @@ class TestRenderCloudCfg: +@@ -82,7 +82,6 @@ class TestRenderCloudCfg: ("freebsd", ["freebsd"]), ("netbsd", ["netbsd"]), ("openbsd", ["openbsd"]), diff --git a/debian/patches/retain-netplan-world-readable.patch b/debian/patches/retain-netplan-world-readable.patch index a1afb558..5195ccbf 100644 --- a/debian/patches/retain-netplan-world-readable.patch +++ b/debian/patches/retain-netplan-world-readable.patch @@ -7,10 +7,8 @@ Forwarded: not-needed Last-Update: 2023-01-09 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: cloud-init/cloudinit/features.py -=================================================================== ---- cloud-init.orig/cloudinit/features.py -+++ cloud-init/cloudinit/features.py +--- a/cloudinit/features.py ++++ b/cloudinit/features.py @@ -59,7 +59,7 @@ only non-hashed passwords were expired. (This flag can be removed after Jammy is no longer supported.) """ @@ -20,10 +18,8 @@ Index: cloud-init/cloudinit/features.py """ If ``NETPLAN_CONFIG_ROOT_READ_ONLY`` is True, then netplan configuration will be written as a single root readon-only file /etc/netplan/50-cloud-init.yaml. -Index: cloud-init/tests/unittests/distros/test_netconfig.py -=================================================================== ---- cloud-init.orig/tests/unittests/distros/test_netconfig.py -+++ cloud-init/tests/unittests/distros/test_netconfig.py +--- a/tests/unittests/distros/test_netconfig.py ++++ b/tests/unittests/distros/test_netconfig.py @@ -592,32 +592,41 @@ class TestNetCfgDistroUbuntuNetplan(Test (self.netplan_path(), V1_TO_V2_NET_CFG_OUTPUT, 0o600), ) |