AMBARI-13070: HDP-specific list of packages should be removed from common-services (jluniya)

ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json

@@ -104,7 +104,6 @@
     {
       "version": "0.7",
       "baseVersion": "2.0.6",
-      "family": "redhat6,suse11",
       "active": "false",
       "services": [
         {
@@ -156,7 +155,6 @@
       "version": "0.8",
       "baseVersion": "2.1",
       "active": "false",
-      "family": "redhat6,suse11",
       "services": [
         {
           "name": "KERBEROS"
@@ -221,7 +219,6 @@
       "version": "0.9",
       "baseVersion": "2.2",
       "active": "false",
-      "family": "redhat6,suse11",
       "services": [
         {
           "name": "KERBEROS"
@@ -298,7 +295,6 @@
       "version": "1.0",
       "baseVersion": "2.3",
       "active": "true",
-      "family": "redhat6,redhat7,suse11",
       "services": [
         {
           "name": "KERBEROS"

ambari-common/src/main/python/pluggable_stack_definition/resources/PHD/custom_stack_map.js

@@ -33,7 +33,7 @@ Example:
 module.exports = [
   {
     "stackName": "PHD",
-    "stackVersionNumber": "3.1",
+    "stackVersionNumber": "3.3",
     "sign": "=",
     "baseStackFolder": "HDP2.3"
   },

ambari-metrics/ambari-metrics-storm-sink/pom.xml

@@ -32,7 +32,7 @@ limitations under the License.
 
   <properties>
     <!--<storm.version>0.9.3.2.2.1.0-2340</storm.version>-->
-    <storm.version>0.10.0.2.3.2.0-2766</storm.version>
+    <storm.version>0.10.0.2.3.2.0-2650</storm.version>
   </properties>
 
   <build>

ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml

@@ -46,24 +46,6 @@
           </commandScript>
         </component>
       </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>kafka_2_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
-          <packages>
-            <package>
-              <name>kafka-2-2-.*</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
       <commandScript>
         <script>scripts/service_check.py</script>
         <scriptType>PYTHON</scriptType>

ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/metainfo.xml

@@ -55,24 +55,6 @@
             </customCommands>
         </component>
       </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>knox_2_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
-          <packages>
-            <package>
-              <name>knox-2-2-.*</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
       <commandScript>
         <script>scripts/service_check.py</script>
         <scriptType>PYTHON</scriptType>

ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml

@@ -108,53 +108,6 @@
         </component>
       </components>
 
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>any</osFamily>
-          <packages>
-            <package>
-              <name>zip</name>
-            </package>
-            <package>
-              <name>mysql-connector-java</name>
-              <skipUpgrade>true</skipUpgrade>
-            </package>
-            <package>
-              <name>extjs</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,redhat7,suse11</osFamily>
-          <packages>
-            <package>
-              <name>oozie_2_3_*</name>
-            </package>
-            <package>
-              <name>falcon_2_3_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
-          <packages>
-            <package>
-              <name>oozie-2-3-.*</name>
-            </package>
-            <package>
-              <name>falcon-2-3-.*</name>
-            </package>
-            <package>
-              <name>extjs</name>
-            </package>
-            <package>
-              <name>libxml2-utils</name>
-            </package>
-          </packages>
-        </osSpecific>
-
-      </osSpecifics>
-
       <commandScript>
         <script>scripts/service_check.py</script>
         <scriptType>PYTHON</scriptType>

ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml

@@ -56,31 +56,6 @@
 
       </components>              
 
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>ranger_2_2_*-admin</name>                                
-            </package>
-            <package>
-              <name>ranger_2_2_*-usersync</name>
-            </package>                           
-          </packages>                        
-        </osSpecific>
-        <osSpecific>
-          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
-          <packages>
-            <package>
-              <name>ranger-2-2-.*-admin</name>                                
-            </package>
-            <package>
-              <name>ranger-2-2-.*-usersync</name>
-            </package>                           
-          </packages>                        
-        </osSpecific>
-      </osSpecifics>
-
       <configuration-dependencies>
         <config-type>admin-properties</config-type>
         <config-type>ranger-site</config-type>

ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml

@@ -41,26 +41,7 @@
           </commandScript>
         </component>
 
-      </components>              
-
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat7,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>ranger_2_3_*-kms</name>                                
-            </package>                           
-          </packages>                        
-        </osSpecific>
-        <osSpecific>
-          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
-          <packages>
-            <package>
-              <name>ranger-2-3-.*-kms</name>                                
-            </package>                           
-          </packages>                        
-        </osSpecific>
-      </osSpecifics>
+      </components>
 
       <configuration-dependencies>
         <config-type>kms-properties</config-type>

ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/metainfo.xml

@@ -85,30 +85,6 @@
           </configFiles>
         </component>
       </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>slider_2_2_*</name>
-            </package>
-            <package>
-              <name>storm_2_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
-          <packages>
-            <package>
-              <name>slider-2-2-.*</name>
-            </package>
-            <package>
-              <name>storm-2-2-.*</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
 
       <commandScript>
         <script>scripts/service_check.py</script>

ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/metainfo.xml

@@ -126,31 +126,6 @@
         </component>
       </components>
 
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>spark_2_2_*</name>
-            </package>
-            <package>
-              <name>spark_2_2_*-python</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
-          <packages>
-            <package>
-              <name>spark-2-2-.*</name>
-            </package>
-            <package>
-              <name>spark-2-2-.*-python</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-
       <configuration-dependencies>
         <config-type>spark-defaults</config-type>
         <config-type>spark-env</config-type>

ambari-server/src/main/resources/common-services/SPARK/1.3.1.2.3/metainfo.xml

@@ -120,31 +120,6 @@
         </component>
       </components>
 
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>spark_2_2_*</name>
-            </package>
-            <package>
-              <name>spark_2_2_*-python</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
-          <packages>
-            <package>
-              <name>spark-2-2-.*</name>
-            </package>
-            <package>
-              <name>spark-2-2-.*-python</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-
       <configuration-dependencies>
         <config-type>spark-defaults</config-type>
         <config-type>spark-env</config-type>

ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml

@@ -21,6 +21,24 @@
     <service>
       <name>KAFKA</name>
       <extends>common-services/KAFKA/0.8.1.2.2</extends>
+      <osSpecifics>
+        <osSpecific>
+          <osFamily>redhat6,suse11</osFamily>
+          <packages>
+            <package>
+              <name>kafka_2_2_*</name>
+            </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
+          <packages>
+            <package>
+              <name>kafka-2-2-.*</name>
+            </package>
+          </packages>
+        </osSpecific>
+      </osSpecifics>
     </service>
   </services>
 </metainfo>

ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml

@@ -21,6 +21,24 @@
     <service>
       <name>KNOX</name>
       <extends>common-services/KNOX/0.5.0.2.2</extends>
+      <osSpecifics>
+        <osSpecific>
+          <osFamily>redhat6,suse11</osFamily>
+          <packages>
+            <package>
+              <name>knox_2_2_*</name>
+            </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
+          <packages>
+            <package>
+              <name>knox-2-2-.*</name>
+            </package>
+          </packages>
+        </osSpecific>
+      </osSpecifics>
     </service>
   </services>
 </metainfo>

ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml

@@ -23,7 +23,31 @@
   <services>
     <service>
       <name>RANGER</name>
-      <extends>common-services/RANGER/0.4.0</extends>   
+      <extends>common-services/RANGER/0.4.0</extends>
+      <osSpecifics>
+        <osSpecific>
+          <osFamily>redhat6,suse11</osFamily>
+          <packages>
+            <package>
+              <name>ranger_2_2_*-admin</name>
+            </package>
+            <package>
+              <name>ranger_2_2_*-usersync</name>
+            </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
+          <packages>
+            <package>
+              <name>ranger-2-2-.*-admin</name>
+            </package>
+            <package>
+              <name>ranger-2-2-.*-usersync</name>
+            </package>
+          </packages>
+        </osSpecific>
+      </osSpecifics>
     </service>
   </services>
 </metainfo>

ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml

@@ -21,6 +21,30 @@
     <service>
       <name>SLIDER</name>
       <extends>common-services/SLIDER/0.60.0.2.2</extends>
+      <osSpecifics>
+        <osSpecific>
+          <osFamily>redhat6,suse11</osFamily>
+          <packages>
+            <package>
+              <name>slider_2_2_*</name>
+            </package>
+            <package>
+              <name>storm_2_2_*</name>
+            </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
+          <packages>
+            <package>
+              <name>slider-2-2-.*</name>
+            </package>
+            <package>
+              <name>storm-2-2-.*</name>
+            </package>
+          </packages>
+        </osSpecific>
+      </osSpecifics>
     </service>
   </services>
 </metainfo>

ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml

@@ -19,12 +19,36 @@
  */
 -->
 <metainfo>
-    <schemaVersion>2.0</schemaVersion>
-    <services>
-        <service>
-            <name>SPARK</name>
-            <extends>common-services/SPARK/1.2.0.2.2</extends>		
-            <version>1.2.1.2.2</version>
-        </service>
-    </services>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>SPARK</name>
+      <extends>common-services/SPARK/1.2.0.2.2</extends>
+      <version>1.2.1.2.2</version>
+      <osSpecifics>
+        <osSpecific>
+          <osFamily>redhat6,suse11</osFamily>
+          <packages>
+            <package>
+              <name>spark_2_2_*</name>
+            </package>
+            <package>
+              <name>spark_2_2_*-python</name>
+            </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
+          <packages>
+            <package>
+              <name>spark-2-2-.*</name>
+            </package>
+            <package>
+              <name>spark-2-2-.*-python</name>
+            </package>
+          </packages>
+        </osSpecific>
+      </osSpecifics>
+    </service>
+  </services>
 </metainfo>

ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml

@@ -21,6 +21,52 @@
     <service>
       <name>OOZIE</name>
       <extends>common-services/OOZIE/4.2.0.2.3</extends>
+      <osSpecifics>
+        <osSpecific>
+          <osFamily>any</osFamily>
+          <packages>
+            <package>
+              <name>zip</name>
+            </package>
+            <package>
+              <name>mysql-connector-java</name>
+              <skipUpgrade>true</skipUpgrade>
+            </package>
+            <package>
+              <name>extjs</name>
+            </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osFamily>redhat5,redhat6,redhat7,suse11</osFamily>
+          <packages>
+            <package>
+              <name>oozie_2_3_*</name>
+            </package>
+            <package>
+              <name>falcon_2_3_*</name>
+            </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
+          <packages>
+            <package>
+              <name>oozie-2-3-.*</name>
+            </package>
+            <package>
+              <name>falcon-2-3-.*</name>
+            </package>
+            <package>
+              <name>extjs</name>
+            </package>
+            <package>
+              <name>libxml2-utils</name>
+            </package>
+          </packages>
+        </osSpecific>
+
+      </osSpecifics>
     </service>
   </services>
 </metainfo>

ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml

@@ -24,6 +24,24 @@
     <service>
       <name>RANGER_KMS</name>
       <extends>common-services/RANGER_KMS/0.5.0.2.3</extends>
+      <osSpecifics>
+        <osSpecific>
+          <osFamily>redhat7,redhat6,suse11</osFamily>
+          <packages>
+            <package>
+              <name>ranger_2_3_*-kms</name>
+            </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
+          <packages>
+            <package>
+              <name>ranger-2-3-.*-kms</name>
+            </package>
+          </packages>
+        </osSpecific>
+      </osSpecifics>
     </service>
   </services>
 </metainfo>

ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml

@@ -24,6 +24,7 @@
         <service>
           <name>SPARK</name>
           <version>1.3.1.2.3</version>
+          <extends>common-services/SPARK/1.3.1.2.3</extends>
           <osSpecifics>
             <osSpecific>
               <osFamily>redhat7,redhat6,suse11</osFamily>
@@ -48,7 +49,6 @@
               </packages>
             </osSpecific>
           </osSpecifics>
-
           <requiredServices>
             <service>YARN</service>
           </requiredServices>