rpms/cloud-init
8
1
Fork 1
Code Issues Pull Requests Releases Activity
4a0442377f
cloud-init/cloud-init-20.4-nm-controlled.patch

501 lines
16 KiB
Diff
Raw Normal View History

Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
From 8256852de570a0c6b237c75abd134ddbafee5c1f Mon Sep 17 00:00:00 2001
Update to 19.4
2020-02-14 14:25:00 +00:00
From: Eduardo Otubo <otubo@redhat.com>
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
Date: Thu, 3 Dec 2020 12:31:50 +0100
Update to 19.4
2020-02-14 14:25:00 +00:00
Subject: [PATCH] Do not write NM_CONTROLLED=no in generated interface config
files
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
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
Update to 19.4
2020-02-14 14:25:00 +00:00
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
Update to 19.4
2020-02-14 14:25:00 +00:00
---
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
cloudinit/net/sysconfig.py | 2 +-
Update to 19.4
2020-02-14 14:25:00 +00:00
.../unittests/test_distros/test_netconfig.py | 8 ---
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
tests/unittests/test_net.py | 49 -------------------
3 files changed, 1 insertion(+), 58 deletions(-)
Update to 19.4
2020-02-14 14:25:00 +00:00
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
index a930e612..9c822c3e 100644
Update to 19.4
2020-02-14 14:25:00 +00:00
--- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
@@ -289,7 +289,7 @@ class Renderer(renderer.Renderer):
# details about this)
iface_defaults = {
- 'rhel': {'ONBOOT': True, 'USERCTL': False, 'NM_CONTROLLED': False,
+ 'rhel': {'ONBOOT': True, 'USERCTL': False,
'BOOTPROTO': 'none'},
'suse': {'BOOTPROTO': 'static', 'STARTMODE': 'auto'},
}
Update to 19.4
2020-02-14 14:25:00 +00:00
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
index a1df066a..bc167f94 100644
Update to 19.4
2020-02-14 14:25:00 +00:00
--- a/tests/unittests/test_distros/test_netconfig.py
+++ b/tests/unittests/test_distros/test_netconfig.py
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
@@ -484,7 +484,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
Update to 19.4
2020-02-14 14:25:00 +00:00
GATEWAY=192.168.1.254
IPADDR=192.168.1.5
NETMASK=255.255.255.0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -492,7 +491,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
Update to 19.4
2020-02-14 14:25:00 +00:00
self.ifcfg_path('eth1'): dedent("""\
BOOTPROTO=dhcp
DEVICE=eth1
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -517,7 +515,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
IPV6_AUTOCONF=no
Update to 19.4
2020-02-14 14:25:00 +00:00
IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
IPV6_FORCE_ACCEPT_RA=no
Update to 19.4
2020-02-14 14:25:00 +00:00
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -525,7 +522,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
Update to 19.4
2020-02-14 14:25:00 +00:00
self.ifcfg_path('eth1'): dedent("""\
BOOTPROTO=dhcp
DEVICE=eth1
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -559,7 +555,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
HWADDR=00:16:3e:60:7c:df
IPADDR=192.10.1.2
Update to 19.4
2020-02-14 14:25:00 +00:00
NETMASK=255.255.255.0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -569,7 +564,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
DEVICE=infra0
IPADDR=10.0.1.2
NETMASK=255.255.0.0
Update to 19.4
2020-02-14 14:25:00 +00:00
- NM_CONTROLLED=no
ONBOOT=yes
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
PHYSDEV=eth0
USERCTL=no
@@ -598,7 +592,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
DEVICE=eth0
IPADDR=192.10.1.2
NETMASK=255.255.255.0
Update to 19.4
2020-02-14 14:25:00 +00:00
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -608,7 +601,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
DEVICE=eth0.1001
IPADDR=10.0.1.2
NETMASK=255.255.0.0
Update to 19.4
2020-02-14 14:25:00 +00:00
- NM_CONTROLLED=no
ONBOOT=yes
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
PHYSDEV=eth0
USERCTL=no
Update to 19.4
2020-02-14 14:25:00 +00:00
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
index 70453683..47a71964 100644
Update to 19.4
2020-02-14 14:25:00 +00:00
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
@@ -535,7 +535,6 @@ GATEWAY=172.19.3.254
Update to 19.4
2020-02-14 14:25:00 +00:00
HWADDR=fa:16:3e:ed:9a:59
IPADDR=172.19.1.34
NETMASK=255.255.252.0
-NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -633,7 +632,6 @@ IPADDR=172.19.1.34
Update to 19.4
2020-02-14 14:25:00 +00:00
IPADDR1=10.0.0.10
NETMASK=255.255.252.0
NETMASK1=255.255.255.0
-NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -756,7 +754,6 @@ IPV6_AUTOCONF=no
Update to 19.4
2020-02-14 14:25:00 +00:00
IPV6_DEFAULTGW=2001:DB8::1
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
IPV6_FORCE_ACCEPT_RA=no
Update to 19.4
2020-02-14 14:25:00 +00:00
NETMASK=255.255.252.0
-NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -884,7 +881,6 @@ NETWORK_CONFIGS = {
Update to 19.4
2020-02-14 14:25:00 +00:00
BOOTPROTO=none
DEVICE=eth1
HWADDR=cf:d6:af:48:e8:80
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no"""),
@@ -901,7 +897,6 @@ NETWORK_CONFIGS = {
Update to 19.4
2020-02-14 14:25:00 +00:00
IPADDR=192.168.21.3
NETMASK=255.255.255.0
METRIC=10000
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no"""),
@@ -1032,7 +1027,6 @@ NETWORK_CONFIGS = {
IPV6_AUTOCONF=no
IPV6_FORCE_ACCEPT_RA=no
Update to 19.4
2020-02-14 14:25:00 +00:00
NETMASK=255.255.255.0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -1095,7 +1089,6 @@ NETWORK_CONFIGS = {
Update to 19.4
2020-02-14 14:25:00 +00:00
DHCPV6C=yes
IPV6INIT=yes
DEVICE=iface0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -1150,7 +1143,6 @@ NETWORK_CONFIGS = {
Update to 19.4
2020-02-14 14:25:00 +00:00
IPV6INIT=yes
IPV6_FORCE_ACCEPT_RA=yes
DEVICE=iface0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -1205,7 +1197,6 @@ NETWORK_CONFIGS = {
Update to 19.4
2020-02-14 14:25:00 +00:00
IPV6INIT=yes
IPV6_FORCE_ACCEPT_RA=no
DEVICE=iface0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -1250,7 +1241,6 @@ NETWORK_CONFIGS = {
Update to 19.4
2020-02-14 14:25:00 +00:00
IPV6_AUTOCONF=yes
IPV6INIT=yes
DEVICE=iface0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -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 = {
Update to 19.4
2020-02-14 14:25:00 +00:00
IPV6_AUTOCONF=yes
IPV6INIT=yes
DEVICE=iface0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -1371,7 +1359,6 @@ NETWORK_CONFIGS = {
Update to 19.4
2020-02-14 14:25:00 +00:00
IPV6INIT=yes
IPV6_FORCE_ACCEPT_RA=yes
DEVICE=iface0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -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
Update to 19.4
2020-02-14 14:25:00 +00:00
DHCPV6C=yes
IPV6INIT=yes
MACADDR=aa:bb:cc:dd:ee:ff
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Bond
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no"""),
@@ -1744,7 +1728,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
Update to 19.4
2020-02-14 14:25:00 +00:00
BOOTPROTO=dhcp
DEVICE=bond0.200
DHCLIENT_SET_DEFAULT_ROUTE=no
- NM_CONTROLLED=no
ONBOOT=yes
PHYSDEV=bond0
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -1762,7 +1745,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
Update to 19.4
2020-02-14 14:25:00 +00:00
IPV6_DEFAULTGW=2001:4800:78ff:1b::1
MACADDR=bb:bb:bb:bb:bb:aa
NETMASK=255.255.255.0
- NM_CONTROLLED=no
ONBOOT=yes
PRIO=22
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
STP=no
@@ -1772,7 +1754,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
Update to 19.4
2020-02-14 14:25:00 +00:00
BOOTPROTO=none
DEVICE=eth0
HWADDR=c0:d6:9f:2c:e8:80
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no"""),
@@ -1789,7 +1770,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
Update to 19.4
2020-02-14 14:25:00 +00:00
MTU=1500
NETMASK=255.255.255.0
NETMASK1=255.255.255.0
- NM_CONTROLLED=no
ONBOOT=yes
PHYSDEV=eth0
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -1799,7 +1779,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
Update to 19.4
2020-02-14 14:25:00 +00:00
DEVICE=eth1
HWADDR=aa:d6:9f:2c:e8:80
MASTER=bond0
- NM_CONTROLLED=no
ONBOOT=yes
SLAVE=yes
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
TYPE=Ethernet
@@ -1809,7 +1788,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
Update to 19.4
2020-02-14 14:25:00 +00:00
DEVICE=eth2
HWADDR=c0:bb:9f:2c:e8:80
MASTER=bond0
- NM_CONTROLLED=no
ONBOOT=yes
SLAVE=yes
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
TYPE=Ethernet
@@ -1819,7 +1797,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
Update to 19.4
2020-02-14 14:25:00 +00:00
BRIDGE=br0
DEVICE=eth3
HWADDR=66:bb:9f:2c:e8:80
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no"""),
@@ -1828,7 +1805,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
Update to 19.4
2020-02-14 14:25:00 +00:00
BRIDGE=br0
DEVICE=eth4
HWADDR=98:bb:9f:2c:e8:80
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no"""),
@@ -1837,7 +1813,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
Update to 19.4
2020-02-14 14:25:00 +00:00
DEVICE=eth5
DHCLIENT_SET_DEFAULT_ROUTE=no
HWADDR=98:bb:9f:2c:e8:8a
- NM_CONTROLLED=no
ONBOOT=no
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no"""),
@@ -1848,7 +1823,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
Update to 19.4
2020-02-14 14:25:00 +00:00
IPADDR=192.168.200.7
MTU=9000
NETMASK=255.255.255.0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=InfiniBand
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no"""),
@@ -2293,7 +2267,6 @@ iface bond0 inet6 static
Update to 19.4
2020-02-14 14:25:00 +00:00
MTU=9000
NETMASK=255.255.255.0
NETMASK1=255.255.255.0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Bond
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -2303,7 +2276,6 @@ iface bond0 inet6 static
Update to 19.4
2020-02-14 14:25:00 +00:00
DEVICE=bond0s0
HWADDR=aa:bb:cc:dd:e8:00
MASTER=bond0
- NM_CONTROLLED=no
ONBOOT=yes
SLAVE=yes
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
TYPE=Ethernet
@@ -2325,7 +2297,6 @@ iface bond0 inet6 static
Update to 19.4
2020-02-14 14:25:00 +00:00
DEVICE=bond0s1
HWADDR=aa:bb:cc:dd:e8:01
MASTER=bond0
- NM_CONTROLLED=no
ONBOOT=yes
SLAVE=yes
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
TYPE=Ethernet
@@ -2382,7 +2353,6 @@ iface bond0 inet6 static
Update to 19.4
2020-02-14 14:25:00 +00:00
BOOTPROTO=none
DEVICE=en0
HWADDR=aa:bb:cc:dd:e8:00
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no"""),
@@ -2401,7 +2371,6 @@ iface bond0 inet6 static
Update to 19.4
2020-02-14 14:25:00 +00:00
MTU=2222
NETMASK=255.255.255.0
NETMASK1=255.255.255.0
- NM_CONTROLLED=no
ONBOOT=yes
PHYSDEV=en0
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -2466,7 +2435,6 @@ iface bond0 inet6 static
Update to 19.4
2020-02-14 14:25:00 +00:00
DEVICE=br0
IPADDR=192.168.2.2
NETMASK=255.255.255.0
- NM_CONTROLLED=no
ONBOOT=yes
PRIO=22
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
STP=no
@@ -2482,7 +2450,6 @@ iface bond0 inet6 static
Update to 19.4
2020-02-14 14:25:00 +00:00
IPV6INIT=yes
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
IPV6_AUTOCONF=no
IPV6_FORCE_ACCEPT_RA=no
Update to 19.4
2020-02-14 14:25:00 +00:00
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -2496,7 +2463,6 @@ iface bond0 inet6 static
Update to 19.4
2020-02-14 14:25:00 +00:00
IPV6INIT=yes
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
IPV6_AUTOCONF=no
IPV6_FORCE_ACCEPT_RA=no
Update to 19.4
2020-02-14 14:25:00 +00:00
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -2590,7 +2556,6 @@ iface bond0 inet6 static
Update to 19.4
2020-02-14 14:25:00 +00:00
HWADDR=52:54:00:12:34:00
IPADDR=192.168.1.2
NETMASK=255.255.255.0
- NM_CONTROLLED=no
ONBOOT=no
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -2600,7 +2565,6 @@ iface bond0 inet6 static
Update to 19.4
2020-02-14 14:25:00 +00:00
DEVICE=eth1
HWADDR=52:54:00:12:34:aa
MTU=1480
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -2609,7 +2573,6 @@ iface bond0 inet6 static
Update to 19.4
2020-02-14 14:25:00 +00:00
BOOTPROTO=none
DEVICE=eth2
HWADDR=52:54:00:12:34:ff
- NM_CONTROLLED=no
ONBOOT=no
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -3026,7 +2989,6 @@ class TestRhelSysConfigRendering(CiTestCase):
Update to 19.4
2020-02-14 14:25:00 +00:00
BOOTPROTO=dhcp
DEVICE=eth1000
HWADDR=07-1c-c6-75-a4-be
-NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -3147,7 +3109,6 @@ GATEWAY=10.0.2.2
Update to 19.4
2020-02-14 14:25:00 +00:00
HWADDR=52:54:00:12:34:00
IPADDR=10.0.2.15
NETMASK=255.255.255.0
-NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -3178,7 +3139,6 @@ HWADDR=fa:16:3e:25:b4:59
Update to 19.4
2020-02-14 14:25:00 +00:00
IPADDR=51.68.89.122
MTU=1500
NETMASK=255.255.240.0
-NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -3192,7 +3152,6 @@ DEVICE=eth1
Update to 19.4
2020-02-14 14:25:00 +00:00
DHCLIENT_SET_DEFAULT_ROUTE=no
HWADDR=fa:16:3e:b1:ca:29
MTU=9000
-NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -3217,7 +3176,6 @@ USERCTL=no
Update to 19.4
2020-02-14 14:25:00 +00:00
#
BOOTPROTO=dhcp
DEVICE=eth0
-NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -3492,7 +3450,6 @@ USERCTL=no
IPV6_FORCE_ACCEPT_RA=no
Update to 19.4
2020-02-14 14:25:00 +00:00
IPV6_DEFAULTGW=2001:db8::1
NETMASK=255.255.255.0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -3517,7 +3474,6 @@ USERCTL=no
Update to 19.4
2020-02-14 14:25:00 +00:00
'ifcfg-eno1': textwrap.dedent("""\
BOOTPROTO=none
DEVICE=eno1
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -3528,7 +3484,6 @@ USERCTL=no
Update to 19.4
2020-02-14 14:25:00 +00:00
IPADDR=192.6.1.9
MTU=1495
NETMASK=255.255.255.0
- NM_CONTROLLED=no
ONBOOT=yes
PHYSDEV=eno1
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -3558,7 +3513,6 @@ USERCTL=no
Update to 19.4
2020-02-14 14:25:00 +00:00
IPADDR=10.101.8.65
MTU=1334
NETMASK=255.255.255.192
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Bond
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
@@ -3568,7 +3522,6 @@ USERCTL=no
Update to 19.4
2020-02-14 14:25:00 +00:00
BOOTPROTO=none
DEVICE=enp0s0
MASTER=bond0
- NM_CONTROLLED=no
ONBOOT=yes
SLAVE=yes
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
TYPE=Bond
@@ -3579,7 +3532,6 @@ USERCTL=no
Update to 19.4
2020-02-14 14:25:00 +00:00
BOOTPROTO=none
DEVICE=enp0s1
MASTER=bond0
- NM_CONTROLLED=no
ONBOOT=yes
SLAVE=yes
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
TYPE=Bond
@@ -3603,7 +3555,6 @@ USERCTL=no
Update to 19.4
2020-02-14 14:25:00 +00:00
DEVICE=eno1
HWADDR=07-1c-c6-75-a4-be
METRIC=100
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
USERCTL=no
Update to 19.4
2020-02-14 14:25:00 +00:00
--
Rebase to 20.4 This is the first step for rebasing cloud-init to 20.4. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2020-12-03 11:49:41 +00:00
2.27.0
Update to 19.4
2020-02-14 14:25:00 +00:00
Reference in New Issue Copy Permalink