You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2017/10/09 18:34:39 UTC
[25/50] [abbrv] 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)
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)
(cherry picked from commit 85801149d811f2e84669c30fba316d074546afaa)
Change-Id: Ie1ff9d5441840bcd2bf458ac143d36d770615d0b
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2030db8c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2030db8c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2030db8c
Branch: refs/heads/2.5-maint
Commit: 2030db8ccc0a78645e9256d786e9719a8a91a3c5
Parents: dcf9a4a
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Aug 18 16:41:05 2017 +0300
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Sat Aug 19 08:09:03 2017 -0700
----------------------------------------------------------------------
.../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/2030db8c/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)