Hello community, here is the log from the commit of package python-azure-agent for openSUSE:Factory checked in at 2018-08-02 14:56:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-azure-agent (Old) and /work/SRC/openSUSE:Factory/.python-azure-agent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-azure-agent" Thu Aug 2 14:56:45 2018 rev:9 rq:620732 version:2.2.18 Changes: -------- --- /work/SRC/openSUSE:Factory/python-azure-agent/python-azure-agent.changes 2018-03-08 10:57:57.984323071 +0100 +++ /work/SRC/openSUSE:Factory/.python-azure-agent.new/python-azure-agent.changes 2018-08-02 14:56:47.960141996 +0200 @@ -1,0 +2,36 @@ +Wed Jun 6 21:59:43 UTC 2018 - rjschwei@suse.com + +- Remove paa_up_only_to_push_hostname.patch + + Turns out the issue was a kernel bug and while ifdown ifup sequence to + bounce the hostname to the DHCP server is overkill we do not + want to carry a "cosmetic" patch + +------------------------------------------------------------------- +Tue Jun 5 19:26:14 UTC 2018 - rjschwei@suse.com + +- Add paa_up_only_to_push_hostname.patch (bsc#1094420) + +------------------------------------------------------------------- +Thu May 10 21:30:31 UTC 2018 - rjschwei@suse.com + +- Add 0001-Handle-the-disapperance-of-net-tools.patch (bsc#1092831) + + Switch to using "ip route" command +- Add paa_sudo_sle15_nopwd.patch + + Work around issue where SLE 15 will not accept the user password when + using sudo, cause unknown, needed to time constraints w.r.t. release +- Add 0001-Properly-detect-SLES-15-for-rdma-support.patch + + Properly detect SLES 15 for RDMA support + +------------------------------------------------------------------- +Mon Apr 2 15:51:08 UTC 2018 - rjschwei@suse.com + +- Add 0001-Detect-openSUSE-and-SLES.patch (bsc#1087764) + + Properly detect SLES 15 and openSUSE Leap 15 in Python 3 + +------------------------------------------------------------------- +Tue Mar 20 13:38:04 UTC 2018 - rjschwei@suse.com + +- Update paa_force_py3_sle15.patch (bsc#1061584) + + Another reference to python, which points to python2 + +------------------------------------------------------------------- New: ---- 0001-Detect-openSUSE-and-SLES.patch 0001-Handle-the-disapperance-of-net-tools.patch 0001-Properly-detect-SLES-15-for-rdma-support.patch paa_sudo_sle15_nopwd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-azure-agent.spec ++++++ --- /var/tmp/diff_new_pack.Em1Nml/_old 2018-08-02 14:56:48.620143103 +0200 +++ /var/tmp/diff_new_pack.Em1Nml/_new 2018-08-02 14:56:48.624143110 +0200 @@ -29,6 +29,10 @@ Patch4: paa_rdma_install_proper_driver.patch Patch5: 0001-Obtain-platform-information-in-Python-version-depend.patch Patch6: paa_force_py3_sle15.patch +Patch7: 0001-Detect-openSUSE-and-SLES.patch +Patch8: 0001-Handle-the-disapperance-of-net-tools.patch +Patch9: paa_sudo_sle15_nopwd.patch +Patch10: 0001-Properly-detect-SLES-15-for-rdma-support.patch BuildRequires: dos2unix BuildRequires: distribution-release @@ -124,6 +128,12 @@ %if 0%{?suse_version} && 0%{?suse_version} > 1315 %patch6 %endif +%patch7 -p1 +%patch8 -p1 +%if 0%{?suse_version} && 0%{?suse_version} > 1315 +%patch9 +%endif +%patch10 -p1 %build %if 0%{?suse_version} && 0%{?suse_version} > 1315 ++++++ 0001-Detect-openSUSE-and-SLES.patch ++++++
From c31fb2403a67c80c183773c8a16885577a1a7099 Mon Sep 17 00:00:00 2001 From: Robert Schweikert
Date: Mon, 2 Apr 2018 11:26:00 -0400 Subject: [PATCH] - Detect openSUSE and SLES + For openSUSE Leap and SLES >= 15 Python 3 is used and the distro is identified as "opensuse" and "sles" while in Python 2 both were lumped together as "suse" + Closes #1089
--- azurelinuxagent/common/osutil/factory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurelinuxagent/common/osutil/factory.py b/azurelinuxagent/common/osutil/factory.py index 5ee611f..4d4f501 100644 --- a/azurelinuxagent/common/osutil/factory.py +++ b/azurelinuxagent/common/osutil/factory.py @@ -69,7 +69,7 @@ def get_osutil(distro_name=DISTRO_NAME, if distro_name == "coreos" or distro_code_name == "coreos": return CoreOSUtil() - if distro_name == "suse": + if distro_name in ("suse", "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'): -- 2.13.6 ++++++ 0001-Handle-the-disapperance-of-net-tools.patch ++++++
From 92820176b0e0b580e9c0f4759e0687ed76eadb68 Mon Sep 17 00:00:00 2001 From: Robert Schweikert
Date: Thu, 10 May 2018 17:16:34 -0400 Subject: [PATCH] - Handle the disapperance of net-tools + Use ip route command when the route command is not available
--- azurelinuxagent/common/osutil/default.py | 22 +++++++++++++++++----- azurelinuxagent/common/utils/shellutil.py | 5 +++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/azurelinuxagent/common/osutil/default.py b/azurelinuxagent/common/osutil/default.py index 0d637b5..6f3dd73 100644 --- a/azurelinuxagent/common/osutil/default.py +++ b/azurelinuxagent/common/osutil/default.py @@ -901,7 +901,10 @@ class DefaultOSUtil(object): return endpoint def is_missing_default_route(self): - routes = shellutil.run_get_output("route -n")[1] + route_cmd = "route -n" + if not shellutil.has_command("route"): + route_cmd = "ip route show" + routes = shellutil.run_get_output(route_cmd)[1] for route in routes.split("\n"): if route.startswith("0.0.0.0 ") or route.startswith("default "): return False @@ -914,11 +917,18 @@ class DefaultOSUtil(object): return self.get_first_if()[1] def set_route_for_dhcp_broadcast(self, ifname): - return shellutil.run("route add 255.255.255.255 dev {0}".format(ifname), + route_cmd = "route add" + if not shellutil.has_command("route"): + route_cmd = "ip route add" + return shellutil.run("{0} 255.255.255.255 dev {1}".format( + route_cmd, ifname), chk_err=False) def remove_route_for_dhcp_broadcast(self, ifname): - shellutil.run("route del 255.255.255.255 dev {0}".format(ifname), + route_cmd = "route del" + if not shellutil.has_command("route"): + route_cmd = "ip route del" + shellutil.run("{0} 255.255.255.255 dev {1}".format(route_cmd, ifname), chk_err=False) def is_dhcp_enabled(self): @@ -950,10 +960,12 @@ class DefaultOSUtil(object): def route_add(self, net, mask, gateway): """ - Add specified route using /sbin/route add -net. + Add specified route """ - cmd = ("/sbin/route add -net " + cmd = ("route add -net " "{0} netmask {1} gw {2}").format(net, mask, gateway) + if not shellutil.has_command("route"): + cmd = "ip route add {0} via {1}".format(net, gateway) return shellutil.run(cmd, chk_err=False) def get_dhcp_pid(self): diff --git a/azurelinuxagent/common/utils/shellutil.py b/azurelinuxagent/common/utils/shellutil.py index 990bf48..2508751 100644 --- a/azurelinuxagent/common/utils/shellutil.py +++ b/azurelinuxagent/common/utils/shellutil.py @@ -57,6 +57,11 @@ if not hasattr(subprocess, 'check_output'): Shell command util functions """ +def has_command(cmd): + """ + Return True if the given command is on the path + """ + return not run(cmd, False) def run(cmd, chk_err=True): """ -- 2.13.6 ++++++ 0001-Properly-detect-SLES-15-for-rdma-support.patch ++++++
From 4fb0a294b9e1148cfde198eb2b4d34045b3a1edb Mon Sep 17 00:00:00 2001 From: Robert Schweikert
Date: Thu, 10 May 2018 17:42:23 -0400 Subject: [PATCH] - Properly detect SLES 15 for rdma support + Due to the switch to Python 3 naming is a bit different
--- azurelinuxagent/pa/rdma/factory.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azurelinuxagent/pa/rdma/factory.py b/azurelinuxagent/pa/rdma/factory.py index 419ad4f..e679562 100644 --- a/azurelinuxagent/pa/rdma/factory.py +++ b/azurelinuxagent/pa/rdma/factory.py @@ -30,7 +30,8 @@ def get_rdma_handler( ): """Return the handler object for RDMA driver handling""" if ( - distro_full_name == 'SUSE Linux Enterprise Server' and + (distro_full_name == 'SUSE Linux Enterprise Server' or + distro_full_name == 'SLES') and int(distro_version) > 11 ): return SUSERDMAHandler() -- 2.13.6 ++++++ paa_force_py3_sle15.patch ++++++ --- /var/tmp/diff_new_pack.Em1Nml/_old 2018-08-02 14:56:48.676143197 +0200 +++ /var/tmp/diff_new_pack.Em1Nml/_new 2018-08-02 14:56:48.676143197 +0200 @@ -6,3 +6,14 @@ # # Azure Linux Agent # +--- init/waagent.service.orig ++++ init/waagent.service +@@ -8,7 +8,7 @@ ConditionPathExists=/etc/waagent.conf + + [Service] + Type=simple +-ExecStart=/usr/bin/python -u /usr/sbin/waagent -daemon ++ExecStart=/usr/bin/python3 -u /usr/sbin/waagent -daemon + Restart=always + RestartSec=5 + ++++++ paa_sudo_sle15_nopwd.patch ++++++ --- azurelinuxagent/common/osutil/default.py.orig +++ azurelinuxagent/common/osutil/default.py @@ -307,7 +307,7 @@ class DefaultOSUtil(object): if nopasswd: sudoer = "{0} ALL=(ALL) NOPASSWD: ALL".format(username) else: - sudoer = "{0} ALL=(ALL) ALL".format(username) + sudoer = "{0} ALL=(ALL) NOPASSWD: ALL".format(username) if not os.path.isfile(sudoers_wagent) or \ fileutil.findstr_in_file(sudoers_wagent, sudoer) is False: fileutil.append_file(sudoers_wagent, "{0}\n".format(sudoer))