You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2016/12/06 20:50:03 UTC
ambari git commit: AMBARI-19107. False warning about NTP not running
on SUSE12. (Attila Doroszlai via swagle)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 ee5651dcf -> 4eaa1b320
AMBARI-19107. False warning about NTP not running on SUSE12. (Attila Doroszlai via swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4eaa1b32
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4eaa1b32
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4eaa1b32
Branch: refs/heads/branch-2.5
Commit: 4eaa1b320983f808b1e15ebc28a13cdca4188221
Parents: ee5651d
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Tue Dec 6 12:49:55 2016 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Tue Dec 6 12:49:55 2016 -0800
----------------------------------------------------------------------
ambari-agent/src/main/python/ambari_agent/HostInfo.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4eaa1b32/ambari-agent/src/main/python/ambari_agent/HostInfo.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/HostInfo.py b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
index 338daac..3810b52 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostInfo.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
@@ -121,12 +121,12 @@ class HostInfo(object):
return False
def get_ntp_service():
- if OSCheck.is_redhat_family() and int(OSCheck.get_os_major_version()) >= 7:
- return ("chronyd", "ntpd",)
- elif OSCheck.is_redhat_family():
- return ("ntpd",)
- elif OSCheck.is_suse_family() or OSCheck.is_ubuntu_family():
- return ("ntp",)
+ if OSCheck.is_redhat_family():
+ return ("ntpd", "chronyd",)
+ elif OSCheck.is_suse_family():
+ return ("ntpd", "ntp",)
+ elif OSCheck.is_ubuntu_family():
+ return ("ntp", "chrony",)
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)