ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [2/2] ambari git commit: AMBARI-21753. Unable to add new host to the upgraded PPC cluster due to exception:Local OS is not compatible with cluster primary OS family (aonishuk)
Date Fri, 18 Aug 2017 13:41:13 GMT
AMBARI-21753. Unable to add new host to the upgraded PPC cluster due to exception:Local OS
is not compatible with cluster primary OS family (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/85801149
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/85801149
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/85801149

Branch: refs/heads/branch-2.5
Commit: 85801149d811f2e84669c30fba316d074546afaa
Parents: 5c09d07
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Fri Aug 18 16:41:05 2017 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Fri Aug 18 16:41:05 2017 +0300

----------------------------------------------------------------------
 .../src/main/python/ambari_server/serverConfiguration.py         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/85801149/ambari-server/src/main/python/ambari_server/serverConfiguration.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index f6f3f43..24656b9 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -1178,8 +1178,8 @@ def update_ambari_properties():
     if NR_USER_PROPERTY not in new_properties.keys():
       new_properties.process_pair(NR_USER_PROPERTY, "root")
 
-    if OS_FAMILY_PROPERTY not in new_properties.keys():
-      new_properties.process_pair(OS_FAMILY_PROPERTY, OS_FAMILY + OS_VERSION)
+    # update the os. In case os detection routine changed
+    new_properties.process_pair(OS_FAMILY_PROPERTY, OS_FAMILY + OS_VERSION)
 
     with open(conf_file, 'w') as hfW:
       new_properties.store(hfW)


Mime
View raw message