rpms/cloud-init
8
1
Fork 1
Code Issues Pull Requests Releases Activity
f3523f3923
cloud-init/cloud-init-21.3-nm-controlled.patch

501 lines
16 KiB
Diff
Raw Normal View History

Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
From 8caf88512cf2c558e55e78b82c27809f5061e2da 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>
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
Date: Thu, 2 Sep 2021 11:22:14 +0200
Subject: [PATCH] Do not write NM_CONTROLLED=no in generated interface config
Update to 19.4
2020-02-14 14:25:00 +00:00
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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
index 06f7255e..ccbd785a 100644
Update to 19.4
2020-02-14 14:25:00 +00:00
--- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -290,7 +290,7 @@ class Renderer(renderer.Renderer):
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
# 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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
index d09e46af..3f01c99e 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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -503,7 +503,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -511,7 +510,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -536,7 +534,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
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
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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -544,7 +541,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -578,7 +574,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
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
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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -588,7 +583,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
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
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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -617,7 +611,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
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
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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -627,7 +620,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
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
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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
index fc77b11e..3e35ff4d 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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -910,7 +907,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"""),
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -927,7 +923,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"""),
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1075,7 +1070,6 @@ NETWORK_CONFIGS = {
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
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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1144,7 +1138,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1199,7 +1192,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1254,7 +1246,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1299,7 +1290,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1326,7 +1316,6 @@ NETWORK_CONFIGS = {
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
DEVICE=iface0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1373,7 +1362,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1421,7 +1409,6 @@ NETWORK_CONFIGS = {
IPV6_AUTOCONF=no
Update to 19.4
2020-02-14 14:25:00 +00:00
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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1454,7 +1441,6 @@ NETWORK_CONFIGS = {
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
'ifcfg-iface0': textwrap.dedent("""\
BOOTPROTO=dhcp
DEVICE=iface0
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1497,7 +1483,6 @@ NETWORK_CONFIGS = {
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
BOOTPROTO=dhcp
DEVICE=iface0
ETHTOOL_OPTS="wol g"
- NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1786,7 +1771,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"""),
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1794,7 +1778,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1812,7 +1795,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1822,7 +1804,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"""),
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1839,7 +1820,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1849,7 +1829,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1859,7 +1838,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1869,7 +1847,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"""),
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1878,7 +1855,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"""),
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1887,7 +1863,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"""),
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -1898,7 +1873,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"""),
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -2343,7 +2317,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -2353,7 +2326,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -2375,7 +2347,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -2432,7 +2403,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"""),
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -2451,7 +2421,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -2516,7 +2485,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -2532,7 +2500,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -2546,7 +2513,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -2640,7 +2606,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -2650,7 +2615,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -2659,7 +2623,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -3080,7 +3043,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -3201,7 +3163,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -3232,7 +3193,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -3246,7 +3206,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -3271,7 +3230,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -3546,7 +3504,6 @@ USERCTL=no
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
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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -3571,7 +3528,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -3582,7 +3538,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -3612,7 +3567,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -3622,7 +3576,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -3633,7 +3586,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
Update to 20.4 This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
2021-09-02 07:44:25 +00:00
@@ -3657,7 +3609,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