AMBARI-20917. Install: Recommend chronyd instead of ntpd for RHEL 7.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/da9185ce Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/da9185ce Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/da9185ce Branch: refs/heads/branch-feature-AMBARI-12556 Commit: da9185ce3c32b95e2d38e67d65e54172d556157a Parents: 154f678 Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Thu May 4 00:22:34 2017 +0300 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Thu May 4 00:22:34 2017 +0300 ---------------------------------------------------------------------- .../src/main/python/ambari_agent/HostInfo.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/da9185ce/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 4b7bfd7..5f96df5 100644 --- a/ambari-agent/src/main/python/ambari_agent/HostInfo.py +++ b/ambari-agent/src/main/python/ambari_agent/HostInfo.py @@ -68,9 +68,22 @@ class HostInfo(object): return 'unknown' def checkLiveServices(self, services, result): + is_redhat7_or_higher = False + is_redhat = False + + if OSCheck.is_redhat_family(): + is_redhat = True + if int(OSCheck.get_os_major_version()) >= 7: + is_redhat7_or_higher = True + for service in services: svcCheckResult = {} - svcCheckResult['name'] = " or ".join(service) + if "ntpd" in service and is_redhat7_or_higher: + svcCheckResult['name'] = "chronyd" + elif "chronyd" in service and is_redhat: + svcCheckResult['name'] = "ntpd" + else: + svcCheckResult['name'] = " or ".join(service) svcCheckResult['status'] = "UNKNOWN" svcCheckResult['desc'] = "" try: