ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject ambari git commit: AMBARI-17868. Regenerate the Ranger keytab step is shown at wrong time (ncole)
Date Sun, 24 Jul 2016 12:18:21 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 85e21b1ff -> 9e13cd32b


AMBARI-17868. Regenerate the Ranger keytab step is shown at wrong time (ncole)


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

Branch: refs/heads/trunk
Commit: 9e13cd32b327e771c153bb25925fc3f493dcd419
Parents: 85e21b1
Author: Nate Cole <ncole@hortonworks.com>
Authored: Sat Jul 23 09:38:12 2016 -0400
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Sun Jul 24 08:16:49 2016 -0400

----------------------------------------------------------------------
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml         | 16 +++++++++-------
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml         | 16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/9e13cd32/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
index 4d5fd07..96b1400 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
@@ -496,6 +496,15 @@
         </task>
       </execute-stage>
 
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Ranger Kerberos
Keytab Check">
+        <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.KerberosKeytabsAction">
+          <summary>Ranger Kerberos Keytab Check</summary>
+          <message>Please follow below steps to complete upgrade in kerberos environment</message>
+          <message>-- If keytabs are managed by Ambari, Perform Regenerate Keytabs
for missing components to get Ranger keytabs and restart Ranger components.</message>
+          <message>-- If keytabs are managed manually, create the required ranger keytabs
in the locations specified in ranger config and restart Ranger components.</message>
+        </task>
+      </execute-stage>
+
       <execute-stage service="HDFS" component="NAMENODE" title="Execute HDFS Finalize">
         <task xsi:type="execute" hosts="master">
           <script>scripts/namenode.py</script>
@@ -541,13 +550,6 @@
 
           <task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation"/>
 
-          <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.KerberosKeytabsAction">
-            <summary>Ranger Kerberos Keytab Check</summary>
-            <message>Please follow below steps to complete upgrade in kerberos environment</message>
-            <message>-- If keytabs are managed by Ambari, Perform Regenerate Keytabs
for missing components to get Ranger keytabs and restart ranger components.</message>
-            <message>-- If keytabs are managed manually, create the required ranger
keytabs in the locations specified in ranger config and restart ranger components.</message>
-          </task>
-
           <task xsi:type="execute" hosts="all">
             <script>scripts/ranger_admin.py</script>
             <function>set_pre_start</function>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9e13cd32/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
index ca60120..2099958 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
@@ -485,6 +485,15 @@
         </task>
       </execute-stage>
 
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Ranger Kerberos
Keytab Check">
+        <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.KerberosKeytabsAction">
+          <summary>Ranger Kerberos Keytab Check</summary>
+          <message>Please follow below steps to complete upgrade in kerberos environment</message>
+          <message>-- If keytabs are managed by Ambari, Perform Regenerate Keytabs
for missing components to get Ranger keytabs and restart Ranger components.</message>
+          <message>-- If keytabs are managed manually, create the required ranger keytabs
in the locations specified in ranger config and restart Ranger components.</message>
+        </task>
+      </execute-stage>
+
       <execute-stage service="HIVE" component="HIVE_SERVER" title="Hive Server Port Change">
         <task xsi:type="manual">
           <message>If there are users or applications using URLS that specify the Hive
Server port number, they will now fail to connect. You can restore the port back to its original
value after the upgrade has been finalized.</message>
@@ -536,13 +545,6 @@
 
           <task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation"/>
 
-          <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.KerberosKeytabsAction">
-            <summary>Ranger Kerberos Keytab Check</summary>
-            <message>Please follow below steps to complete upgrade in kerberos environment</message>
-            <message>-- If keytabs are managed by Ambari, Perform Regenerate Keytabs
for missing components to get Ranger keytabs and restart ranger components.</message>
-            <message>-- If keytabs are managed manually, create the required ranger
keytabs in the locations specified in ranger config and restart ranger components.</message>
-          </task>
-
           <task xsi:type="execute" hosts="all">
             <script>scripts/ranger_admin.py</script>
             <function>set_pre_start</function>


Mime
View raw message