diff --git a/0001-Fix-the-service-order-for-SUSE-distributions.patch b/0001-Fix-the-service-order-for-SUSE-distributions.patch deleted file mode 100644 index 25144b5..0000000 --- a/0001-Fix-the-service-order-for-SUSE-distributions.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1f7950f72dc5f3603118c0f91dca3fb7145f0801 Mon Sep 17 00:00:00 2001 -From: Robert Schweikert -Date: Wed, 24 Oct 2018 09:50:11 -0400 -Subject: [PATCH] - Fix the service order for SUSE distributions + Network - configuration file gets written when cloud-init.service runs. Therefore - this needs to run prior to the network tools (wicked) - ---- - systemd/cloud-init.service.tmpl | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl -index b92e8abc..5cb00371 100644 ---- a/systemd/cloud-init.service.tmpl -+++ b/systemd/cloud-init.service.tmpl -@@ -14,8 +14,7 @@ After=networking.service - After=network.service - {% endif %} - {% if variant in ["suse"] %} --Requires=wicked.service --After=wicked.service -+Before=wicked.service - # setting hostname via hostnamectl depends on dbus, which otherwise - # would not be guaranteed at this point. - After=dbus.service --- -2.13.7 - diff --git a/0001-Follow-the-ever-bouncing-ball-for-openSUSE-distribut.patch b/0001-Follow-the-ever-bouncing-ball-for-openSUSE-distribut.patch deleted file mode 100644 index 74e5835..0000000 --- a/0001-Follow-the-ever-bouncing-ball-for-openSUSE-distribut.patch +++ /dev/null @@ -1,40 +0,0 @@ -From eb504025c76909175ab2d00c25232b89faf01ab4 Mon Sep 17 00:00:00 2001 -From: Robert Schweikert -Date: Sun, 21 Oct 2018 08:28:21 -0400 -Subject: [PATCH 1/2] - Follow the ever bouncing ball for openSUSE distribution - identification + openSUSE changed from identifying itself as "opensuse" in - os-release to "opensuse-tumbleweed" and "opensuse-leap". This breaks - template expansion - ---- - cloudinit/util.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/cloudinit/util.py b/cloudinit/util.py -index c67d6be6..7800f7bc 100644 ---- a/cloudinit/util.py -+++ b/cloudinit/util.py -@@ -615,8 +615,8 @@ def get_linux_distro(): - distro_name = os_release.get('ID', '') - distro_version = os_release.get('VERSION_ID', '') - if 'sles' in distro_name or 'suse' in distro_name: -- # RELEASE_BLOCKER: We will drop this sles ivergent behavior in -- # before 18.4 so that get_linux_distro returns a named tuple -+ # RELEASE_BLOCKER: We will drop this sles divergent behavior in -+ # the future so that get_linux_distro returns a named tuple - # which will include both version codename and architecture - # on all distributions. - flavor = platform.machine() -@@ -668,7 +668,8 @@ def system_info(): - var = 'ubuntu' - elif linux_dist == 'redhat': - var = 'rhel' -- elif linux_dist in ('opensuse', 'sles'): -+ elif linux_dist in ( -+ 'opensuse', 'opensuse-tumbleweed', 'opensuse-leap', 'sles'): - var = 'suse' - else: - var = 'linux' --- -2.13.7 - diff --git a/0002-Add-tests-for-additional-openSUSE-distro-condition-m.patch b/0002-Add-tests-for-additional-openSUSE-distro-condition-m.patch deleted file mode 100644 index af6aeec..0000000 --- a/0002-Add-tests-for-additional-openSUSE-distro-condition-m.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 33d988113c3897ea7e0d1eda402d30dfec119602 Mon Sep 17 00:00:00 2001 -From: Robert Schweikert -Date: Sun, 21 Oct 2018 08:46:15 -0400 -Subject: [PATCH 2/2] - Add tests for additional openSUSE distro condition - mechanisms - ---- - cloudinit/tests/test_util.py | 75 ++++++++++++++++++++++++++++++++++---------- - 1 file changed, 59 insertions(+), 16 deletions(-) - -diff --git a/cloudinit/tests/test_util.py b/cloudinit/tests/test_util.py -index 749a3846..c3f52c7b 100644 ---- a/cloudinit/tests/test_util.py -+++ b/cloudinit/tests/test_util.py -@@ -18,25 +18,51 @@ MOUNT_INFO = [ - ] - - OS_RELEASE_SLES = dedent("""\ -- NAME="SLES"\n -- VERSION="12-SP3"\n -- VERSION_ID="12.3"\n -- PRETTY_NAME="SUSE Linux Enterprise Server 12 SP3"\n -- ID="sles"\nANSI_COLOR="0;32"\n -- CPE_NAME="cpe:/o:suse:sles:12:sp3"\n -+ NAME="SLES" -+ VERSION="12-SP3" -+ VERSION_ID="12.3" -+ PRETTY_NAME="SUSE Linux Enterprise Server 12 SP3" -+ ID="sles" -+ ANSI_COLOR="0;32" -+ CPE_NAME="cpe:/o:suse:sles:12:sp3" - """) - - OS_RELEASE_OPENSUSE = dedent("""\ --NAME="openSUSE Leap" --VERSION="42.3" --ID=opensuse --ID_LIKE="suse" --VERSION_ID="42.3" --PRETTY_NAME="openSUSE Leap 42.3" --ANSI_COLOR="0;32" --CPE_NAME="cpe:/o:opensuse:leap:42.3" --BUG_REPORT_URL="https://bugs.opensuse.org" --HOME_URL="https://www.opensuse.org/" -+ NAME="openSUSE Leap" -+ VERSION="42.3" -+ ID=opensuse -+ ID_LIKE="suse" -+ VERSION_ID="42.3" -+ PRETTY_NAME="openSUSE Leap 42.3" -+ ANSI_COLOR="0;32" -+ CPE_NAME="cpe:/o:opensuse:leap:42.3" -+ BUG_REPORT_URL="https://bugs.opensuse.org" -+ HOME_URL="https://www.opensuse.org/" -+""") -+ -+OS_RELEASE_OPENSUSE_L15 = dedent("""\ -+ NAME="openSUSE Leap" -+ VERSION="15.0" -+ ID="opensuse-leap" -+ ID_LIKE="suse opensuse" -+ VERSION_ID="15.0" -+ PRETTY_NAME="openSUSE Leap 15.0" -+ ANSI_COLOR="0;32" -+ CPE_NAME="cpe:/o:opensuse:leap:15.0" -+ BUG_REPORT_URL="https://bugs.opensuse.org" -+ HOME_URL="https://www.opensuse.org/" -+""") -+ -+OS_RELEASE_OPENSUSE_TW = dedent("""\ -+ NAME="openSUSE Tumbleweed" -+ ID="opensuse-tumbleweed" -+ ID_LIKE="opensuse suse" -+ VERSION_ID="20180920" -+ PRETTY_NAME="openSUSE Tumbleweed" -+ ANSI_COLOR="0;32" -+ CPE_NAME="cpe:/o:opensuse:tumbleweed:20180920" -+ BUG_REPORT_URL="https://bugs.opensuse.org" -+ HOME_URL="https://www.opensuse.org/" - """) - - OS_RELEASE_CENTOS = dedent("""\ -@@ -453,6 +479,23 @@ class TestGetLinuxDistro(CiTestCase): - dist = util.get_linux_distro() - self.assertEqual(('opensuse', '42.3', platform.machine()), dist) - -+ @mock.patch('cloudinit.util.load_file') -+ def test_get_linux_opensuse_l15(self, m_os_release, m_path_exists): -+ """Verify we get the correct name and machine arch on OpenSUSE.""" -+ m_os_release.return_value = OS_RELEASE_OPENSUSE_L15 -+ m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists -+ dist = util.get_linux_distro() -+ self.assertEqual(('opensuse-leap', '15.0', platform.machine()), dist) -+ -+ @mock.patch('cloudinit.util.load_file') -+ def test_get_linux_opensuse_tw(self, m_os_release, m_path_exists): -+ """Verify we get the correct name and machine arch on OpenSUSE.""" -+ m_os_release.return_value = OS_RELEASE_OPENSUSE_TW -+ m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists -+ dist = util.get_linux_distro() -+ self.assertEqual( -+ ('opensuse-tumbleweed', '20180920', platform.machine()), dist) -+ - @mock.patch('platform.dist') - def test_get_linux_distro_no_data(self, m_platform_dist, m_path_exists): - """Verify we get no information if os-release does not exist""" --- -2.13.7 -