Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-azure-agent for
openSUSE:Factory checked in at 2021-01-22 21:51:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-azure-agent (Old)
and /work/SRC/openSUSE:Factory/.python-azure-agent.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-azure-agent"
Fri Jan 22 21:51:43 2021 rev:18 rq:865019 version:2.2.49.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-azure-agent/python-azure-agent.changes
2020-10-12 13:59:35.178222891 +0200
+++
/work/SRC/openSUSE:Factory/.python-azure-agent.new.28504/python-azure-agent.changes
2021-01-22 21:51:45.077800345 +0100
@@ -1,0 +2,7 @@
+Tue Jan 12 21:20:17 UTC 2021 - Robert Schweikert <rjsch...@suse.com>
+
+- Add sle_hpc-is-sles.patch (bsc#1180719)
+ + Recognise SLE_HPC as SLES and use the proper RDMA handler and
+ distro specific initialization code
+
+-------------------------------------------------------------------
New:
----
sle_hpc-is-sles.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-azure-agent.spec ++++++
--- /var/tmp/diff_new_pack.WxMxBo/_old 2021-01-22 21:51:45.965801604 +0100
+++ /var/tmp/diff_new_pack.WxMxBo/_new 2021-01-22 21:51:45.969801610 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-azure-agent
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,7 @@
Patch1: agent-no-auto-update.patch
Patch6: paa_force_py3_sle15.patch
Patch11: proper_dhcp_config_set.patch
+Patch12: sle_hpc-is-sles.patch
BuildRequires: dos2unix
BuildRequires: distribution-release
@@ -120,6 +121,7 @@
%patch6
%endif
%patch11
+%patch12 -p1
%build
%if 0%{?suse_version} && 0%{?suse_version} > 1315
++++++ sle_hpc-is-sles.patch ++++++
diff --git a/azurelinuxagent/common/osutil/factory.py
b/azurelinuxagent/common/osutil/factory.py
index 69f84300..1b2ffaaf 100644
--- a/azurelinuxagent/common/osutil/factory.py
+++ b/azurelinuxagent/common/osutil/factory.py
@@ -83,7 +83,7 @@ def _get_osutil(distro_name, distro_code_name,
distro_version, distro_full_name)
if distro_name == "coreos" or distro_code_name == "coreos":
return CoreOSUtil()
- if distro_name in ("suse", "sles", "opensuse"):
+ if distro_name in ("suse", "sle_hpc", "sles", "opensuse"):
if distro_full_name == 'SUSE Linux Enterprise Server' \
and Version(distro_version) < Version('12') \
or distro_full_name == 'openSUSE' and Version(distro_version)
< Version('13.2'):
diff --git a/azurelinuxagent/common/protocol/imds.py
b/azurelinuxagent/common/protocol/imds.py
index a4600ad8..0e7b3052 100644
--- a/azurelinuxagent/common/protocol/imds.py
+++ b/azurelinuxagent/common/protocol/imds.py
@@ -112,28 +112,45 @@ ENDORSED_IMAGE_INFO_MATCHER_JSON = """{
"SLES-BYOS": {
"List": [
"11-SP4",
- "11-SP5",
- "11-SP6",
+ "12",
"12-SP1",
"12-SP2",
"12-SP3",
"12-SP4",
"12-SP5",
- "12-SP6"
+ "15",
+ "15-SP1",
+ "15-SP2",
+ "15-SP3",
+ "15-SP4",
+ "15-SP5"
]
},
"SLES-SAP": {
"List": [
"11-SP4",
- "11-SP5",
- "11-SP6",
+ "12",
"12-SP1",
"12-SP2",
"12-SP3",
"12-SP4",
"12-SP5",
- "12-SP6"
+ "15",
+ "15-SP1",
+ "15-SP2",
+ "15-SP3",
+ "15-SP4",
+ "15-SP5"
]
+ },
+ "SLE-HPC": {
+ "List": [
+ "15-SP1",
+ "15-SP2",
+ "15-SP3",
+ "15-SP4",
+ "15-SP5"
+ ]
}
}
}"""
diff --git a/azurelinuxagent/pa/rdma/factory.py
b/azurelinuxagent/pa/rdma/factory.py
index 2de176fa..f0f51897 100644
--- a/azurelinuxagent/pa/rdma/factory.py
+++ b/azurelinuxagent/pa/rdma/factory.py
@@ -33,7 +33,8 @@ def get_rdma_handler(
"""Return the handler object for RDMA driver handling"""
if (
(distro_full_name == 'SUSE Linux Enterprise Server' or
- distro_full_name == 'SLES') and
+ distro_full_name == 'SLES' or
+ distro_full_name == 'SLE_HPC') and
Version(distro_version) > Version('11')
):
return SUSERDMAHandler()
diff --git a/azurelinuxagent/pa/rdma/suse.py b/azurelinuxagent/pa/rdma/suse.py
index b4582581..4bf2147a 100644
--- a/azurelinuxagent/pa/rdma/suse.py
+++ b/azurelinuxagent/pa/rdma/suse.py
@@ -20,14 +20,23 @@
import glob
import azurelinuxagent.common.logger as logger
import azurelinuxagent.common.utils.shellutil as shellutil
+
from azurelinuxagent.common.rdma import RDMAHandler
+from azurelinuxagent.common.version import DISTRO_VERSION
+from distutils.version import LooseVersion as Version
class SUSERDMAHandler(RDMAHandler):
def install_driver(self):
"""Install the appropriate driver package for the RDMA firmware"""
+ if Version(DISTRO_VERSION) >= Version('15'):
+ msg = 'SLE 15 and later only supports PCI pass through, no '
+ msg += 'special driver needed for IB interface'
+ logger.info(msg)
+ return True
+
fw_version = self.get_rdma_version()
if not fw_version:
error_msg = 'RDMA: Could not determine firmware version. '
