AMBARI-11016. RU: Re-arrange manual steps in upgrade packs (dlysnichenko)

ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml

@@ -50,6 +50,12 @@
         </task>
       </execute-stage>
 
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Pre Upgrade Ranger">
+        <task xsi:type="manual">
+          <message>Before continuing, please backup the Ranger Admin database and Ranger Audit database</message>
+        </task>
+      </execute-stage>
+
     </group>
 
     <group name="ZOOKEEPER" title="ZooKeeper">
@@ -306,11 +312,6 @@
 
     <service name="RANGER">
       <component name="RANGER_ADMIN">
-        <pre-upgrade>
-          <task xsi:type="manual">
-            <message>Before continuing, please backup the Ranger Admin database and Ranger Audit database</message>
-          </task>
-        </pre-upgrade>
         <upgrade>
           <task xsi:type="restart" />
         </upgrade>

ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml

@@ -50,6 +50,12 @@
         </task>
       </execute-stage>
 
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Pre Upgrade Ranger">
+        <task xsi:type="manual">
+          <message>Before continuing, please backup the Ranger Admin database and Ranger Audit database</message>
+        </task>
+      </execute-stage>
+
     </group>
 
     <group name="ZOOKEEPER" title="ZooKeeper">
@@ -306,11 +312,6 @@
 
     <service name="RANGER">
       <component name="RANGER_ADMIN">
-        <pre-upgrade>
-          <task xsi:type="manual">
-            <message>Before continuing, please backup the Ranger Admin database and Ranger Audit database</message>
-          </task>
-        </pre-upgrade>
         <upgrade>
           <task xsi:type="restart" />
         </upgrade>

ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml

@@ -50,6 +50,12 @@
         </task>
       </execute-stage>
 
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Pre Upgrade Ranger">
+        <task xsi:type="manual">
+          <message>Before continuing, please backup the Ranger Admin database and Ranger Audit database</message>
+        </task>
+      </execute-stage>
+
     </group>
 
     <group name="ZOOKEEPER" title="ZooKeeper">
@@ -306,11 +312,6 @@
 
     <service name="RANGER">
       <component name="RANGER_ADMIN">
-        <pre-upgrade>
-          <task xsi:type="manual">
-            <message>Before continuing, please backup the Ranger Admin database and Ranger Audit database</message>
-          </task>
-        </pre-upgrade>
         <upgrade>
           <task xsi:type="restart" />
         </upgrade>