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/64188616 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/64188616 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/64188616 Branch: refs/heads/branch-feature-AMBARI-18456 Commit: 641886160877e4bc4c38e9d461967285d77bd0c3 Parents: 502d444 Author: Siddharth Wagle <[email protected]> Authored: Tue Dec 6 12:50:18 2016 -0800 Committer: Siddharth Wagle <[email protected]> Committed: Tue Dec 6 12:50:18 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/64188616/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)
