packages/cloud-init
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 20.4

Browse Source
This commit is contained in:
yang_zhuang_zhuang 2021-06-26 14:54:03 +08:00
parent c21ca0c6dd
commit 5dee37f7fe
7 changed files with 225 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
cloud-init-20.3.tar.gz
View File

Binary file not shown.

69
cloud-init-20.4-Revert-ssh_util-handle-non-default-AuthorizedKeysFil.patch Normal file
View File

@ -0,0 +1,69 @@
From 9a4c22ac0b660cd2573b9a88d14a0ef39b61afca Mon Sep 17 00:00:00 2001
From: Eduardo Otubo <otubo@redhat.com>
Date: Wed, 3 Feb 2021 10:28:49 +0100
Subject: [PATCH] Revert "ssh_util: handle non-default AuthorizedKeysFile
config (#586)" (#775)
This reverts commit b0e73814db4027dba0b7dc0282e295b7f653325c.
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
---
cloudinit/ssh_util.py | 6 +++---
tests/unittests/test_sshutil.py | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py
index d5113996..c08042d6 100644
--- a/cloudinit/ssh_util.py
+++ b/cloudinit/ssh_util.py
@@ -262,13 +262,13 @@ def extract_authorized_keys(username, sshd_cfg_file=DEF_SSHD_CFG):
except (IOError, OSError):
# Give up and use a default key filename
- auth_key_fns.append(default_authorizedkeys_file)
+ auth_key_fns[0] = default_authorizedkeys_file
util.logexc(LOG, "Failed extracting 'AuthorizedKeysFile' in SSH "
"config from %r, using 'AuthorizedKeysFile' file "
"%r instead", DEF_SSHD_CFG, auth_key_fns[0])
- # always store all the keys in the first file configured on sshd_config
- return (auth_key_fns[0], parse_authorized_keys(auth_key_fns))
+ # always store all the keys in the user's private file
+ return (default_authorizedkeys_file, parse_authorized_keys(auth_key_fns))
def setup_user_keys(keys, username, options=None):
diff --git a/tests/unittests/test_sshutil.py b/tests/unittests/test_sshutil.py
index 88a111e3..fd1d1bac 100644
--- a/tests/unittests/test_sshutil.py
+++ b/tests/unittests/test_sshutil.py
@@ -593,7 +593,7 @@ class TestMultipleSshAuthorizedKeysFile(test_helpers.CiTestCase):
fpw.pw_name, sshd_config)
content = ssh_util.update_authorized_keys(auth_key_entries, [])
- self.assertEqual(authorized_keys, auth_key_fn)
+ self.assertEqual("%s/.ssh/authorized_keys" % fpw.pw_dir, auth_key_fn)
self.assertTrue(VALID_CONTENT['rsa'] in content)
self.assertTrue(VALID_CONTENT['dsa'] in content)
@@ -610,7 +610,7 @@ class TestMultipleSshAuthorizedKeysFile(test_helpers.CiTestCase):
sshd_config = self.tmp_path('sshd_config')
util.write_file(
sshd_config,
- "AuthorizedKeysFile %s %s" % (user_keys, authorized_keys)
+ "AuthorizedKeysFile %s %s" % (authorized_keys, user_keys)
)
(auth_key_fn, auth_key_entries) = ssh_util.extract_authorized_keys(
@@ -618,7 +618,7 @@ class TestMultipleSshAuthorizedKeysFile(test_helpers.CiTestCase):
)
content = ssh_util.update_authorized_keys(auth_key_entries, [])
- self.assertEqual(user_keys, auth_key_fn)
+ self.assertEqual("%s/.ssh/authorized_keys" % fpw.pw_dir, auth_key_fn)
self.assertTrue(VALID_CONTENT['rsa'] in content)
self.assertTrue(VALID_CONTENT['dsa'] in content)
--
2.27.0

10
cloud-init-19.4-disable-lxd-tests.patch → cloud-init-20.4-disable-lxd-tests.patch
View File

@ -1,7 +1,7 @@
From 1a8143951839afd5b0f80e9d00af582daa429fdc Mon Sep 17 00:00:00 2001 From f70a9a0a98c0af5a7b2aea9a8e4b40bbe1668038 Mon Sep 17 00:00:00 2001
From: Eduardo Otubo <otubo@redhat.com> From: Eduardo Otubo <otubo@redhat.com>
Date: Fri, 21 Feb 2020 10:52:26 +0100 Date: Thu, 3 Dec 2020 12:31:42 +0100
Subject: [PATCH] Disable LXD tests Subject: [PATCH 1/3] Disable LXD tests
Signed-off-by: Eduardo Otubo <otubo@redhat.com> Signed-off-by: Eduardo Otubo <otubo@redhat.com>
--- ---
@ -9,7 +9,7 @@ Signed-off-by: Eduardo Otubo <otubo@redhat.com>
1 file changed, 2 deletions(-) 1 file changed, 2 deletions(-)
diff --git a/tests/cloud_tests/platforms/__init__.py b/tests/cloud_tests/platforms/__init__.py diff --git a/tests/cloud_tests/platforms/__init__.py b/tests/cloud_tests/platforms/__init__.py
index e506baa..e7efcba 100644 index e506baa0..e7efcba5 100644
--- a/tests/cloud_tests/platforms/__init__.py --- a/tests/cloud_tests/platforms/__init__.py
+++ b/tests/cloud_tests/platforms/__init__.py +++ b/tests/cloud_tests/platforms/__init__.py
@@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
@ -29,5 +29,5 @@ index e506baa..e7efcba 100644
} }
-- --
2.17.2 2.27.0

203
cloud-init-19.4-nm-controlled.patch → cloud-init-20.4-nm-controlled.patch
View File

@ -1,21 +1,28 @@
From 98657d64a1d40769b31fcf375ebb1ea0b373350c Mon Sep 17 00:00:00 2001 From 8256852de570a0c6b237c75abd134ddbafee5c1f Mon Sep 17 00:00:00 2001
From: Eduardo Otubo <otubo@redhat.com> From: Eduardo Otubo <otubo@redhat.com>
Date: Fri, 21 Feb 2020 11:10:09 +0100 Date: Thu, 3 Dec 2020 12:31:50 +0100
Subject: [PATCH] Do not write NM_CONTROLLED=no in generated interface config Subject: [PATCH] Do not write NM_CONTROLLED=no in generated interface config
files files
Conflicts 20.3:
- Not appplying patch on cloudinit/net/sysconfig.py since it now has a
mechanism to identify if cloud-init is running on RHEL, having the
correct settings for NM_CONTROLLED.
X-downstream-only: true
Signed-off-by: Eduardo Otubo <otubo@redhat.com> Signed-off-by: Eduardo Otubo <otubo@redhat.com>
Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
--- ---
cloudinit/net/sysconfig.py | 1 - cloudinit/net/sysconfig.py | 2 +-
.../unittests/test_distros/test_netconfig.py | 8 --- .../unittests/test_distros/test_netconfig.py | 8 ---
tests/unittests/test_net.py | 55 ------------------- tests/unittests/test_net.py | 49 -------------------
3 files changed, 64 deletions(-) 3 files changed, 1 insertion(+), 58 deletions(-)
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
index 0a5d481..23e467d 100644 index a930e612..9c822c3e 100644
--- a/cloudinit/net/sysconfig.py --- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py +++ b/cloudinit/net/sysconfig.py
@@ -277,7 +277,7 @@ class Renderer(renderer.Renderer): @@ -289,7 +289,7 @@ class Renderer(renderer.Renderer):
# details about this) # details about this)
iface_defaults = { iface_defaults = {
@ -25,7 +32,7 @@ index 0a5d481..23e467d 100644
'suse': {'BOOTPROTO': 'static', 'STARTMODE': 'auto'}, 'suse': {'BOOTPROTO': 'static', 'STARTMODE': 'auto'},
} }
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
index 8d7b09c..46a256a 100644 index a1df066a..bc167f94 100644
--- a/tests/unittests/test_distros/test_netconfig.py --- a/tests/unittests/test_distros/test_netconfig.py
+++ b/tests/unittests/test_distros/test_netconfig.py +++ b/tests/unittests/test_distros/test_netconfig.py
@@ -484,7 +484,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase): @@ -484,7 +484,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
@ -44,15 +51,15 @@ index 8d7b09c..46a256a 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -515,7 +513,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase): @@ -517,7 +515,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
IPV6ADDR=2607:f0d0:1002:0011::2/64 IPV6_AUTOCONF=no
IPV6INIT=yes
IPV6_DEFAULTGW=2607:f0d0:1002:0011::1 IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
IPV6_FORCE_ACCEPT_RA=no
- NM_CONTROLLED=no - NM_CONTROLLED=no
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -523,7 +520,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase): @@ -525,7 +522,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
self.ifcfg_path('eth1'): dedent("""\ self.ifcfg_path('eth1'): dedent("""\
BOOTPROTO=dhcp BOOTPROTO=dhcp
DEVICE=eth1 DEVICE=eth1
@ -60,8 +67,40 @@ index 8d7b09c..46a256a 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -559,7 +555,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
HWADDR=00:16:3e:60:7c:df
IPADDR=192.10.1.2
NETMASK=255.255.255.0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
@@ -569,7 +564,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
DEVICE=infra0
IPADDR=10.0.1.2
NETMASK=255.255.0.0
- NM_CONTROLLED=no
ONBOOT=yes
PHYSDEV=eth0
USERCTL=no
@@ -598,7 +592,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
DEVICE=eth0
IPADDR=192.10.1.2
NETMASK=255.255.255.0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
@@ -608,7 +601,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
DEVICE=eth0.1001
IPADDR=10.0.1.2
NETMASK=255.255.0.0
- NM_CONTROLLED=no
ONBOOT=yes
PHYSDEV=eth0
USERCTL=no
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index 54cc846..65986c2 100644 index 70453683..47a71964 100644
--- a/tests/unittests/test_net.py --- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py +++ b/tests/unittests/test_net.py
@@ -535,7 +535,6 @@ GATEWAY=172.19.3.254 @@ -535,7 +535,6 @@ GATEWAY=172.19.3.254
@ -80,15 +119,15 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -754,7 +752,6 @@ IPV6ADDR_SECONDARIES="2001:DB9::10/64 2001:DB10::10/64" @@ -756,7 +754,6 @@ IPV6_AUTOCONF=no
IPV6INIT=yes
IPV6_DEFAULTGW=2001:DB8::1 IPV6_DEFAULTGW=2001:DB8::1
IPV6_FORCE_ACCEPT_RA=no
NETMASK=255.255.252.0 NETMASK=255.255.252.0
-NM_CONTROLLED=no -NM_CONTROLLED=no
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -882,7 +879,6 @@ NETWORK_CONFIGS = { @@ -884,7 +881,6 @@ NETWORK_CONFIGS = {
BOOTPROTO=none BOOTPROTO=none
DEVICE=eth1 DEVICE=eth1
HWADDR=cf:d6:af:48:e8:80 HWADDR=cf:d6:af:48:e8:80
@ -96,7 +135,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no"""), USERCTL=no"""),
@@ -899,7 +895,6 @@ NETWORK_CONFIGS = { @@ -901,7 +897,6 @@ NETWORK_CONFIGS = {
IPADDR=192.168.21.3 IPADDR=192.168.21.3
NETMASK=255.255.255.0 NETMASK=255.255.255.0
METRIC=10000 METRIC=10000
@ -104,15 +143,15 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no"""), USERCTL=no"""),
@@ -1028,7 +1023,6 @@ NETWORK_CONFIGS = { @@ -1032,7 +1027,6 @@ NETWORK_CONFIGS = {
IPV6ADDR=2001:1::1/64 IPV6_AUTOCONF=no
IPV6INIT=yes IPV6_FORCE_ACCEPT_RA=no
NETMASK=255.255.255.0 NETMASK=255.255.255.0
- NM_CONTROLLED=no - NM_CONTROLLED=no
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -1091,7 +1085,6 @@ NETWORK_CONFIGS = { @@ -1095,7 +1089,6 @@ NETWORK_CONFIGS = {
DHCPV6C=yes DHCPV6C=yes
IPV6INIT=yes IPV6INIT=yes
DEVICE=iface0 DEVICE=iface0
@ -120,7 +159,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -1146,7 +1139,6 @@ NETWORK_CONFIGS = { @@ -1150,7 +1143,6 @@ NETWORK_CONFIGS = {
IPV6INIT=yes IPV6INIT=yes
IPV6_FORCE_ACCEPT_RA=yes IPV6_FORCE_ACCEPT_RA=yes
DEVICE=iface0 DEVICE=iface0
@ -128,7 +167,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -1201,7 +1193,6 @@ NETWORK_CONFIGS = { @@ -1205,7 +1197,6 @@ NETWORK_CONFIGS = {
IPV6INIT=yes IPV6INIT=yes
IPV6_FORCE_ACCEPT_RA=no IPV6_FORCE_ACCEPT_RA=no
DEVICE=iface0 DEVICE=iface0
@ -136,7 +175,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -1246,7 +1237,6 @@ NETWORK_CONFIGS = { @@ -1250,7 +1241,6 @@ NETWORK_CONFIGS = {
IPV6_AUTOCONF=yes IPV6_AUTOCONF=yes
IPV6INIT=yes IPV6INIT=yes
DEVICE=iface0 DEVICE=iface0
@ -144,7 +183,15 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -1293,7 +1283,6 @@ NETWORK_CONFIGS = { @@ -1277,7 +1267,6 @@ NETWORK_CONFIGS = {
IPV6_AUTOCONF=no
IPV6_FORCE_ACCEPT_RA=no
DEVICE=iface0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
@@ -1324,7 +1313,6 @@ NETWORK_CONFIGS = {
IPV6_AUTOCONF=yes IPV6_AUTOCONF=yes
IPV6INIT=yes IPV6INIT=yes
DEVICE=iface0 DEVICE=iface0
@ -152,7 +199,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -1340,7 +1329,6 @@ NETWORK_CONFIGS = { @@ -1371,7 +1359,6 @@ NETWORK_CONFIGS = {
IPV6INIT=yes IPV6INIT=yes
IPV6_FORCE_ACCEPT_RA=yes IPV6_FORCE_ACCEPT_RA=yes
DEVICE=iface0 DEVICE=iface0
@ -160,7 +207,23 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -1622,7 +1610,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true @@ -1404,7 +1391,6 @@ NETWORK_CONFIGS = {
'ifcfg-iface0': textwrap.dedent("""\
BOOTPROTO=dhcp
DEVICE=iface0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
@@ -1447,7 +1433,6 @@ NETWORK_CONFIGS = {
BOOTPROTO=dhcp
DEVICE=iface0
ETHTOOL_OPTS="wol g"
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
@@ -1736,7 +1721,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
DHCPV6C=yes DHCPV6C=yes
IPV6INIT=yes IPV6INIT=yes
MACADDR=aa:bb:cc:dd:ee:ff MACADDR=aa:bb:cc:dd:ee:ff
@ -168,15 +231,15 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Bond TYPE=Bond
USERCTL=no"""), USERCTL=no"""),
@@ -1630,7 +1617,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true @@ -1744,7 +1728,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
BOOTPROTO=dhcp BOOTPROTO=dhcp
DEVICE=bond0.200 DEVICE=bond0.200
DHCLIENT_SET_DEFAULT_ROUTE=no DHCLIENT_SET_DEFAULT_ROUTE=no
- NM_CONTROLLED=no - NM_CONTROLLED=no
ONBOOT=yes ONBOOT=yes
PHYSDEV=bond0 PHYSDEV=bond0
TYPE=Ethernet USERCTL=no
@@ -1647,7 +1633,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true @@ -1762,7 +1745,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
IPV6_DEFAULTGW=2001:4800:78ff:1b::1 IPV6_DEFAULTGW=2001:4800:78ff:1b::1
MACADDR=bb:bb:bb:bb:bb:aa MACADDR=bb:bb:bb:bb:bb:aa
NETMASK=255.255.255.0 NETMASK=255.255.255.0
@ -184,7 +247,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
PRIO=22 PRIO=22
STP=no STP=no
@@ -1657,7 +1642,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true @@ -1772,7 +1754,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
BOOTPROTO=none BOOTPROTO=none
DEVICE=eth0 DEVICE=eth0
HWADDR=c0:d6:9f:2c:e8:80 HWADDR=c0:d6:9f:2c:e8:80
@ -192,15 +255,15 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no"""), USERCTL=no"""),
@@ -1674,7 +1658,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true @@ -1789,7 +1770,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
MTU=1500 MTU=1500
NETMASK=255.255.255.0 NETMASK=255.255.255.0
NETMASK1=255.255.255.0 NETMASK1=255.255.255.0
- NM_CONTROLLED=no - NM_CONTROLLED=no
ONBOOT=yes ONBOOT=yes
PHYSDEV=eth0 PHYSDEV=eth0
TYPE=Ethernet USERCTL=no
@@ -1685,7 +1668,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true @@ -1799,7 +1779,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
DEVICE=eth1 DEVICE=eth1
HWADDR=aa:d6:9f:2c:e8:80 HWADDR=aa:d6:9f:2c:e8:80
MASTER=bond0 MASTER=bond0
@ -208,7 +271,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
SLAVE=yes SLAVE=yes
TYPE=Ethernet TYPE=Ethernet
@@ -1695,7 +1677,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true @@ -1809,7 +1788,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
DEVICE=eth2 DEVICE=eth2
HWADDR=c0:bb:9f:2c:e8:80 HWADDR=c0:bb:9f:2c:e8:80
MASTER=bond0 MASTER=bond0
@ -216,7 +279,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
SLAVE=yes SLAVE=yes
TYPE=Ethernet TYPE=Ethernet
@@ -1705,7 +1686,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true @@ -1819,7 +1797,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
BRIDGE=br0 BRIDGE=br0
DEVICE=eth3 DEVICE=eth3
HWADDR=66:bb:9f:2c:e8:80 HWADDR=66:bb:9f:2c:e8:80
@ -224,7 +287,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no"""), USERCTL=no"""),
@@ -1714,7 +1694,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true @@ -1828,7 +1805,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
BRIDGE=br0 BRIDGE=br0
DEVICE=eth4 DEVICE=eth4
HWADDR=98:bb:9f:2c:e8:80 HWADDR=98:bb:9f:2c:e8:80
@ -232,7 +295,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no"""), USERCTL=no"""),
@@ -1723,7 +1702,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true @@ -1837,7 +1813,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
DEVICE=eth5 DEVICE=eth5
DHCLIENT_SET_DEFAULT_ROUTE=no DHCLIENT_SET_DEFAULT_ROUTE=no
HWADDR=98:bb:9f:2c:e8:8a HWADDR=98:bb:9f:2c:e8:8a
@ -240,7 +303,7 @@ index 54cc846..65986c2 100644
ONBOOT=no ONBOOT=no
TYPE=Ethernet TYPE=Ethernet
USERCTL=no"""), USERCTL=no"""),
@@ -1734,7 +1712,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true @@ -1848,7 +1823,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
IPADDR=192.168.200.7 IPADDR=192.168.200.7
MTU=9000 MTU=9000
NETMASK=255.255.255.0 NETMASK=255.255.255.0
@ -248,7 +311,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=InfiniBand TYPE=InfiniBand
USERCTL=no"""), USERCTL=no"""),
@@ -2177,7 +2154,6 @@ iface bond0 inet6 static @@ -2293,7 +2267,6 @@ iface bond0 inet6 static
MTU=9000 MTU=9000
NETMASK=255.255.255.0 NETMASK=255.255.255.0
NETMASK1=255.255.255.0 NETMASK1=255.255.255.0
@ -256,7 +319,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Bond TYPE=Bond
USERCTL=no USERCTL=no
@@ -2187,7 +2163,6 @@ iface bond0 inet6 static @@ -2303,7 +2276,6 @@ iface bond0 inet6 static
DEVICE=bond0s0 DEVICE=bond0s0
HWADDR=aa:bb:cc:dd:e8:00 HWADDR=aa:bb:cc:dd:e8:00
MASTER=bond0 MASTER=bond0
@ -264,7 +327,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
SLAVE=yes SLAVE=yes
TYPE=Ethernet TYPE=Ethernet
@@ -2209,7 +2184,6 @@ iface bond0 inet6 static @@ -2325,7 +2297,6 @@ iface bond0 inet6 static
DEVICE=bond0s1 DEVICE=bond0s1
HWADDR=aa:bb:cc:dd:e8:01 HWADDR=aa:bb:cc:dd:e8:01
MASTER=bond0 MASTER=bond0
@ -272,7 +335,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
SLAVE=yes SLAVE=yes
TYPE=Ethernet TYPE=Ethernet
@@ -2266,7 +2240,6 @@ iface bond0 inet6 static @@ -2382,7 +2353,6 @@ iface bond0 inet6 static
BOOTPROTO=none BOOTPROTO=none
DEVICE=en0 DEVICE=en0
HWADDR=aa:bb:cc:dd:e8:00 HWADDR=aa:bb:cc:dd:e8:00
@ -280,15 +343,15 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no"""), USERCTL=no"""),
@@ -2283,7 +2256,6 @@ iface bond0 inet6 static @@ -2401,7 +2371,6 @@ iface bond0 inet6 static
MTU=2222 MTU=2222
NETMASK=255.255.255.0 NETMASK=255.255.255.0
NETMASK1=255.255.255.0 NETMASK1=255.255.255.0
- NM_CONTROLLED=no - NM_CONTROLLED=no
ONBOOT=yes ONBOOT=yes
PHYSDEV=en0 PHYSDEV=en0
TYPE=Ethernet USERCTL=no
@@ -2349,7 +2321,6 @@ iface bond0 inet6 static @@ -2466,7 +2435,6 @@ iface bond0 inet6 static
DEVICE=br0 DEVICE=br0
IPADDR=192.168.2.2 IPADDR=192.168.2.2
NETMASK=255.255.255.0 NETMASK=255.255.255.0
@ -296,23 +359,23 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
PRIO=22 PRIO=22
STP=no STP=no
@@ -2363,7 +2334,6 @@ iface bond0 inet6 static @@ -2482,7 +2450,6 @@ iface bond0 inet6 static
HWADDR=52:54:00:12:34:00
IPV6ADDR=2001:1::100/96
IPV6INIT=yes IPV6INIT=yes
IPV6_AUTOCONF=no
IPV6_FORCE_ACCEPT_RA=no
- NM_CONTROLLED=no - NM_CONTROLLED=no
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -2375,7 +2345,6 @@ iface bond0 inet6 static @@ -2496,7 +2463,6 @@ iface bond0 inet6 static
HWADDR=52:54:00:12:34:01
IPV6ADDR=2001:1::101/96
IPV6INIT=yes IPV6INIT=yes
IPV6_AUTOCONF=no
IPV6_FORCE_ACCEPT_RA=no
- NM_CONTROLLED=no - NM_CONTROLLED=no
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -2469,7 +2438,6 @@ iface bond0 inet6 static @@ -2590,7 +2556,6 @@ iface bond0 inet6 static
HWADDR=52:54:00:12:34:00 HWADDR=52:54:00:12:34:00
IPADDR=192.168.1.2 IPADDR=192.168.1.2
NETMASK=255.255.255.0 NETMASK=255.255.255.0
@ -320,7 +383,7 @@ index 54cc846..65986c2 100644
ONBOOT=no ONBOOT=no
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -2479,7 +2447,6 @@ iface bond0 inet6 static @@ -2600,7 +2565,6 @@ iface bond0 inet6 static
DEVICE=eth1 DEVICE=eth1
HWADDR=52:54:00:12:34:aa HWADDR=52:54:00:12:34:aa
MTU=1480 MTU=1480
@ -328,7 +391,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -2488,7 +2455,6 @@ iface bond0 inet6 static @@ -2609,7 +2573,6 @@ iface bond0 inet6 static
BOOTPROTO=none BOOTPROTO=none
DEVICE=eth2 DEVICE=eth2
HWADDR=52:54:00:12:34:ff HWADDR=52:54:00:12:34:ff
@ -336,7 +399,7 @@ index 54cc846..65986c2 100644
ONBOOT=no ONBOOT=no
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -2905,7 +2871,6 @@ class TestRhelSysConfigRendering(CiTestCase): @@ -3026,7 +2989,6 @@ class TestRhelSysConfigRendering(CiTestCase):
BOOTPROTO=dhcp BOOTPROTO=dhcp
DEVICE=eth1000 DEVICE=eth1000
HWADDR=07-1c-c6-75-a4-be HWADDR=07-1c-c6-75-a4-be
@ -344,7 +407,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -3026,7 +2991,6 @@ GATEWAY=10.0.2.2 @@ -3147,7 +3109,6 @@ GATEWAY=10.0.2.2
HWADDR=52:54:00:12:34:00 HWADDR=52:54:00:12:34:00
IPADDR=10.0.2.15 IPADDR=10.0.2.15
NETMASK=255.255.255.0 NETMASK=255.255.255.0
@ -352,7 +415,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -3057,7 +3021,6 @@ HWADDR=fa:16:3e:25:b4:59 @@ -3178,7 +3139,6 @@ HWADDR=fa:16:3e:25:b4:59
IPADDR=51.68.89.122 IPADDR=51.68.89.122
MTU=1500 MTU=1500
NETMASK=255.255.240.0 NETMASK=255.255.240.0
@ -360,7 +423,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -3071,7 +3034,6 @@ DEVICE=eth1 @@ -3192,7 +3152,6 @@ DEVICE=eth1
DHCLIENT_SET_DEFAULT_ROUTE=no DHCLIENT_SET_DEFAULT_ROUTE=no
HWADDR=fa:16:3e:b1:ca:29 HWADDR=fa:16:3e:b1:ca:29
MTU=9000 MTU=9000
@ -368,7 +431,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -3096,7 +3058,6 @@ USERCTL=no @@ -3217,7 +3176,6 @@ USERCTL=no
# #
BOOTPROTO=dhcp BOOTPROTO=dhcp
DEVICE=eth0 DEVICE=eth0
@ -376,15 +439,15 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -3300,7 +3261,6 @@ USERCTL=no @@ -3492,7 +3450,6 @@ USERCTL=no
IPV6INIT=yes IPV6_FORCE_ACCEPT_RA=no
IPV6_DEFAULTGW=2001:db8::1 IPV6_DEFAULTGW=2001:db8::1
NETMASK=255.255.255.0 NETMASK=255.255.255.0
- NM_CONTROLLED=no - NM_CONTROLLED=no
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -3325,7 +3285,6 @@ USERCTL=no @@ -3517,7 +3474,6 @@ USERCTL=no
'ifcfg-eno1': textwrap.dedent("""\ 'ifcfg-eno1': textwrap.dedent("""\
BOOTPROTO=none BOOTPROTO=none
DEVICE=eno1 DEVICE=eno1
@ -392,15 +455,15 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
@@ -3336,7 +3295,6 @@ USERCTL=no @@ -3528,7 +3484,6 @@ USERCTL=no
IPADDR=192.6.1.9 IPADDR=192.6.1.9
MTU=1495 MTU=1495
NETMASK=255.255.255.0 NETMASK=255.255.255.0
- NM_CONTROLLED=no - NM_CONTROLLED=no
ONBOOT=yes ONBOOT=yes
PHYSDEV=eno1 PHYSDEV=eno1
TYPE=Ethernet USERCTL=no
@@ -3367,7 +3325,6 @@ USERCTL=no @@ -3558,7 +3513,6 @@ USERCTL=no
IPADDR=10.101.8.65 IPADDR=10.101.8.65
MTU=1334 MTU=1334
NETMASK=255.255.255.192 NETMASK=255.255.255.192
@ -408,7 +471,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
TYPE=Bond TYPE=Bond
USERCTL=no USERCTL=no
@@ -3377,7 +3334,6 @@ USERCTL=no @@ -3568,7 +3522,6 @@ USERCTL=no
BOOTPROTO=none BOOTPROTO=none
DEVICE=enp0s0 DEVICE=enp0s0
MASTER=bond0 MASTER=bond0
@ -416,7 +479,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
SLAVE=yes SLAVE=yes
TYPE=Bond TYPE=Bond
@@ -3388,7 +3344,6 @@ USERCTL=no @@ -3579,7 +3532,6 @@ USERCTL=no
BOOTPROTO=none BOOTPROTO=none
DEVICE=enp0s1 DEVICE=enp0s1
MASTER=bond0 MASTER=bond0
@ -424,7 +487,7 @@ index 54cc846..65986c2 100644
ONBOOT=yes ONBOOT=yes
SLAVE=yes SLAVE=yes
TYPE=Bond TYPE=Bond
@@ -3412,7 +3367,6 @@ USERCTL=no @@ -3603,7 +3555,6 @@ USERCTL=no
DEVICE=eno1 DEVICE=eno1
HWADDR=07-1c-c6-75-a4-be HWADDR=07-1c-c6-75-a4-be
METRIC=100 METRIC=100
@ -433,5 +496,5 @@ index 54cc846..65986c2 100644
TYPE=Ethernet TYPE=Ethernet
USERCTL=no USERCTL=no
-- --
2.17.2 2.27.0

12
cloud-init-19.4-no-override-default-network.patch → cloud-init-20.4-no-override-default-network.patch
View File

@ -1,7 +1,7 @@
From 674873573abf2b6e10b09d533a58437c35d508f8 Mon Sep 17 00:00:00 2001 From 5514d5922cbc92278868bfea587c4207619d81fc Mon Sep 17 00:00:00 2001
From: Eduardo Otubo <otubo@redhat.com> From: Eduardo Otubo <otubo@redhat.com>
Date: Fri, 21 Feb 2020 11:40:34 +0100 Date: Thu, 3 Dec 2020 12:34:01 +0100
Subject: [PATCH] Don't override default network configuration Subject: [PATCH 3/3] Don't override default network configuration
Signed-off-by: Eduardo Otubo <otubo@redhat.com> Signed-off-by: Eduardo Otubo <otubo@redhat.com>
--- ---
@ -9,10 +9,10 @@ Signed-off-by: Eduardo Otubo <otubo@redhat.com>
1 file changed, 11 insertions(+), 1 deletion(-) 1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
index 310cdf01..87b8f743 100644 index 9c822c3e..a240f65e 100644
--- a/cloudinit/net/sysconfig.py --- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py +++ b/cloudinit/net/sysconfig.py
@@ -755,7 +755,17 @@ class Renderer(renderer.Renderer): @@ -918,7 +918,17 @@ class Renderer(renderer.Renderer):
# Distros configuring /etc/sysconfig/network as a file e.g. Centos # Distros configuring /etc/sysconfig/network as a file e.g. Centos
if sysconfig_path.endswith('network'): if sysconfig_path.endswith('network'):
util.ensure_dir(os.path.dirname(sysconfig_path)) util.ensure_dir(os.path.dirname(sysconfig_path))
@ -32,5 +32,5 @@ index 310cdf01..87b8f743 100644
netcfg.append('NETWORKING_IPV6=yes') netcfg.append('NETWORKING_IPV6=yes')
netcfg.append('IPV6_AUTOCONF=no') netcfg.append('IPV6_AUTOCONF=no')
-- --
2.17.2 2.27.0

BIN
cloud-init-20.4.tar.gz Normal file
View File

Binary file not shown.

17
cloud-init.spec
View File

@ -1,6 +1,6 @@
Name: cloud-init Name: cloud-init
Version: 20.3 Version: 20.4
Release: 3 Release: 1
Summary: the defacto multi-distribution package that handles early initialization of a cloud instance. Summary: the defacto multi-distribution package that handles early initialization of a cloud instance.
License: ASL 2.0 or GPLv3 License: ASL 2.0 or GPLv3
URL: http://launchpad.net/cloud-init URL: http://launchpad.net/cloud-init
@ -8,13 +8,14 @@ Source0: https://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{vers
Source1: cloud-init-tmpfiles.conf Source1: cloud-init-tmpfiles.conf
Patch0: cloud-init-19.4-disable-lxd-tests.patch Patch0: cloud-init-20.4-disable-lxd-tests.patch
Patch1: cloud-init-19.4-nm-controlled.patch Patch1: cloud-init-20.4-nm-controlled.patch
Patch2: cloud-init-19.4-no-override-default-network.patch Patch2: cloud-init-20.4-no-override-default-network.patch
Patch3: bugfix-cloud-init-add-openEuler-os.patch Patch3: bugfix-cloud-init-add-openEuler-os.patch
Patch4: bugfix-sort-requirements.patch Patch4: bugfix-sort-requirements.patch
Patch5: add-variable-to-forbid-tmp-dir.patch Patch5: add-variable-to-forbid-tmp-dir.patch
Patch6: cloud-init-20.4-sandbox-ca_certs-tests-to-avoid-failure.patch Patch6: cloud-init-20.4-sandbox-ca_certs-tests-to-avoid-failure.patch
Patch7: cloud-init-20.4-Revert-ssh_util-handle-non-default-AuthorizedKeysFil.patch
Patch9000: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch Patch9000: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch
@ -123,6 +124,12 @@ fi
%exclude /usr/share/doc/* %exclude /usr/share/doc/*
%changelog %changelog
* Sat Jun 26 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 20.4-1
- Type:update
- ID:NA
- SUG:NA
- DESC:update to 20.4
* Sat Jun 19 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 20.3-3 * Sat Jun 19 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 20.3-3
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA