You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/06/10 19:22:11 UTC

ambari git commit: AMBARI-11846. Add hive2 credential to oozie-site.xml for RU (ncole)

Repository: ambari
Updated Branches:
  refs/heads/trunk 829a5e85c -> cd9d915aa


AMBARI-11846. Add hive2 credential to oozie-site.xml for RU (ncole)


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

Branch: refs/heads/trunk
Commit: cd9d915aa6f9d1f84455f739e6ed5be826adcba1
Parents: 829a5e8
Author: Nate Cole <nc...@hortonworks.com>
Authored: Wed Jun 10 12:52:22 2015 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Wed Jun 10 13:21:54 2015 -0400

----------------------------------------------------------------------
 .../common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml   | 2 +-
 .../src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/cd9d915a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
index 8b44ae6..9ef56ca 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
@@ -42,7 +42,7 @@
 
   <property>
     <name>oozie.credentials.credentialclasses</name>
-    <value>hcat=org.apache.oozie.action.hadoop.HCatCredentials</value>
+    <value>hcat=org.apache.oozie.action.hadoop.HCatCredentials,hive2=org.apache.oozie.action.hadoop.Hive2Credentials</value>
     <description>
       Credential Class to be used for HCat.
     </description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/cd9d915a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
index 10bca13..cc5caf1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
@@ -889,7 +889,6 @@
               <keep-key>oozie.authentication.type</keep-key>
               <keep-key>oozie.authentication.simple.anonymous.allowed</keep-key>
               <keep-key>oozie.authentication.kerberos.name.rules</keep-key>
-              <keep-key>oozie.credentials.credentialclasses</keep-key>
               <keep-key>oozie.service.AuthorizationService.authorization.enabled</keep-key>
               <keep-key>oozie.service.HadoopAccessorService.hadoop.configurations</keep-key>
               <keep-key>oozie.service.HadoopAccessorService.kerberos.enabled</keep-key>
@@ -904,6 +903,7 @@
               <keep-key>oozie.service.ELService.ext.functions.coord-sla-submit</keep-key>
               <keep-key>oozie.service.ELService.ext.functions.coord-sla-create</keep-key>
             </transfer>
+            <set key="oozie.credentials.credentialclasses" value="hcat=org.apache.oozie.action.hadoop.HCatCredentials,hive2=org.apache.oozie.action.hadoop.Hive2Credentials" />
           </task>
         </pre-upgrade>
         <upgrade>