You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2017/08/18 13:41:12 UTC
[1/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)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 5c09d0760 -> 85801149d
refs/heads/trunk 09fed274b -> 1dba7786f
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/1dba7786
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1dba7786
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1dba7786
Branch: refs/heads/trunk
Commit: 1dba7786f7bb8f99251fd5c74a3ddeb0bf2fb118
Parents: 09fed27
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Aug 18 16:40:56 2017 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Aug 18 16:40:56 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/1dba7786/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 631c9a7..c2ecb01 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -1182,8 +1182,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)
[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)
Posted by ao...@apache.org.
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 <ao...@hortonworks.com>
Authored: Fri Aug 18 16:41:05 2017 +0300
Committer: Andrew Onishuk <ao...@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)