You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2015/11/04 09:59:40 UTC

ambari git commit: AMBARI-13702. Consistency check failed when try to deploy ZK+STORM only cluster for HDP 2.3 stack.(vbrodetskyi)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 2a89def1c -> 7920b417e


AMBARI-13702. Consistency check failed when try to deploy ZK+STORM only cluster for HDP 2.3 stack.(vbrodetskyi)


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

Branch: refs/heads/branch-2.1
Commit: 7920b417e44e8a4960602a890d786fd72fa67c74
Parents: 2a89def
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Wed Nov 4 10:59:26 2015 +0200
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Wed Nov 4 10:59:26 2015 +0200

----------------------------------------------------------------------
 .../main/resources/stacks/HDP/2.2/services/stack_advisor.py    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7920b417/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 06519ac..8238481 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -779,7 +779,8 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
   def recommendStormConfigurations(self, configurations, clusterData, services, hosts):
     putStormSiteProperty = self.putProperty(configurations, "storm-site", services)
     putStormSiteAttributes = self.putPropertyAttribute(configurations, "storm-site")
-    core_site = services["configurations"]["core-site"]["properties"]
+    if "core-site" in services["configurations"]:
+      core_site = services["configurations"]["core-site"]["properties"]
     stackVersion = services["Versions"]["stack_version"]
     if "ranger-env" in services["configurations"] and "ranger-storm-plugin-properties" in services["configurations"] and \
         "ranger-storm-plugin-enabled" in services["configurations"]["ranger-env"]["properties"]:
@@ -804,7 +805,8 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
     else:
       rangerClass = 'org.apache.ranger.authorization.storm.authorizer.RangerStormAuthorizer'
     # Cluster is kerberized
-    if ('hadoop.security.authentication' in core_site and core_site['hadoop.security.authentication'] == 'kerberos'):
+    if "core-site" in services["configurations"] and \
+          ('hadoop.security.authentication' in core_site and core_site['hadoop.security.authentication'] == 'kerberos'):
       if rangerPluginEnabled and (rangerPluginEnabled.lower() == 'Yes'.lower()):
         putStormSiteProperty('nimbus.authorizer',rangerClass)
       elif (services["configurations"]["storm-site"]["properties"]["nimbus.authorizer"] == rangerClass):