Repository: ambari
Updated Branches:
  refs/heads/trunk eb9487bfc -> c22791cbd


AMBARI-10928. After enabling security start services failed at Spark Client 
Install (aonishuk)


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

Branch: refs/heads/trunk
Commit: c22791cbdf6a7458831c3b7d744e7b457e264797
Parents: eb9487b
Author: Andrew Onishuk <[email protected]>
Authored: Tue May 5 14:30:37 2015 +0300
Committer: Andrew Onishuk <[email protected]>
Committed: Tue May 5 14:30:37 2015 +0300

----------------------------------------------------------------------
 .../common-services/SPARK/1.2.0.2.2/package/scripts/params.py    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c22791cb/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index bda4a76..ddaebaf 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -131,7 +131,7 @@ if security_enabled:
   spark_principal = 
spark_kerberos_principal.replace('_HOST',spark_history_server_host.lower())
   
   if is_hive_installed:
-    spark_hive_properties += {
+    spark_hive_properties.update({
       'hive.metastore.sasl.enabled': 
str(config['configurations']['hive-site']['hive.metastore.sasl.enabled']).lower(),
       'hive.metastore.kerberos.keytab.file': 
config['configurations']['hive-site']['hive.metastore.kerberos.keytab.file'],
       'hive.server2.authentication.spnego.principal': 
config['configurations']['hive-site']['hive.server2.authentication.spnego.principal'],
@@ -141,7 +141,7 @@ if security_enabled:
       'hive.server2.authentication.kerberos.keytab': 
config['configurations']['hive-site']['hive.server2.authentication.kerberos.keytab'],
       'hive.security.authorization.enabled': 
spark_hive_sec_authorization_enabled,
       'hive.server2.enable.doAs': 
str(config['configurations']['hive-site']['hive.server2.enable.doAs']).lower()
-    }
+    })
   
 
 

Reply via email to