AMBARI-7857 Fix package name wildcards for Ubuntu HDP2.2 (dsen)

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

@@ -24,13 +24,21 @@
       <version>0.6.0.2.2.9.9</version>
       <osSpecifics>
         <osSpecific>
-          <osFamily>any</osFamily>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
               <name>falcon_2_2_0_0_*</name>
             </package>
           </packages>
         </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>falcon-2-2-0-0-.*</name>
+            </package>
+          </packages>
+        </osSpecific>
       </osSpecifics>
     </service>
   </services>

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

@@ -25,13 +25,21 @@
 
       <osSpecifics>
         <osSpecific>
-          <osFamily>any</osFamily>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
               <name>flume_2_2_0_0_*</name>
             </package>
           </packages>
         </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>flume-2-2-0-0-.*</name>
+            </package>
+          </packages>
+        </osSpecific>
       </osSpecifics>
 
     </service>

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

@@ -25,13 +25,21 @@
 
       <osSpecifics>
         <osSpecific>
-          <osFamily>any</osFamily>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
               <name>hbase_2_2_0_0_*</name>
             </package>
           </packages>
         </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>hbase-2-2-0-0-.*</name>
+            </package>
+          </packages>
+        </osSpecific>
       </osSpecifics>
 
     </service>

ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml

@@ -21,69 +21,17 @@
 -->
 
 <configuration>
-  <property>
-    <name>hdfs_log_dir_prefix</name>
-    <value>/var/log/hadoop</value>
-    <description>Hadoop Log Dir Prefix</description>
-  </property>
-  <property>
-    <name>hadoop_pid_dir_prefix</name>
-    <value>/var/run/hadoop</value>
-    <description>Hadoop PID Dir Prefix</description>
-  </property>
-  <property>
-    <name>hadoop_root_logger</name>
-    <value>INFO,RFA</value>
-    <description>Hadoop Root Logger</description>
-  </property>
-  <property>
-    <name>hadoop_heapsize</name>
-    <value>1024</value>
-    <description>Hadoop maximum Java heap size</description>
-  </property>
-  <property>
-    <name>namenode_heapsize</name>
-    <value>1024</value>
-    <description>NameNode Java heap size</description>
-  </property>
-  <property>
-    <name>namenode_opt_newsize</name>
-    <value>200</value>
-    <description>NameNode new generation size</description>
-  </property>
-  <property>
-    <name>namenode_opt_maxnewsize</name>
-    <value>200</value>
-    <description>NameNode maximum new generation size</description>
-  </property>
   <property>
     <name>namenode_opt_permsize</name>
-    <value>128</value>
+    <value>128m</value>
     <description>NameNode permanent generation size</description>
   </property>
   <property>
     <name>namenode_opt_maxpermsize</name>
-    <value>256</value>
+    <value>256m</value>
     <description>NameNode maximum permanent generation size</description>
   </property>
-  <property>
-    <name>dtnode_heapsize</name>
-    <value>1024</value>
-    <description>DataNode maximum Java heap size</description>
-  </property>
-  <property>
-    <name>proxyuser_group</name>
-    <value>users</value>
-    <property-type>GROUP</property-type>
-    <description>Proxy user group.</description>
-  </property>
-  <property>
-    <name>hdfs_user</name>
-    <value>hdfs</value>
-    <property-type>USER</property-type>
-    <description>User to run HDFS as</description>
-  </property>
-  
+
   <!-- hadoop-env.sh -->
   <property>
     <name>content</name>
@@ -201,4 +149,4 @@ export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/hdp/current/hadoop-client/lib
     </value>
   </property>
   
-</configuration>
+</configuration>

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

@@ -27,9 +27,6 @@
         <osSpecific>
           <osFamily>any</osFamily>
           <packages>
-            <package>
-              <name>hadoop_2_2_0_0_*</name>
-            </package>
             <package>
               <name>hadoop-lzo</name>
             </package>
@@ -39,6 +36,9 @@
         <osSpecific>
           <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
+            <package>
+              <name>hadoop_2_2_0_0_*</name>
+            </package>
             <package>
               <name>snappy</name>
             </package>
@@ -59,7 +59,42 @@
             </package>
           </packages>
         </osSpecific>
-            
+
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>hadoop-2-2-0-0-.*-client</name>
+            </package>
+            <package>
+              <name>hadoop-2-2-0-0-.*-hdfs-datanode</name>
+            </package>
+            <package>
+              <name>hadoop-2-2-0-0-.*-hdfs-journalnode</name>
+            </package>
+            <package>
+              <name>hadoop-2-2-0-0-.*-hdfs-namenode</name>
+            </package>
+            <package>
+              <name>hadoop-2-2-0-0-.*-hdfs-secondarynamenode</name>
+            </package>
+            <package>
+              <name>hadoop-2-2-0-0-.*-hdfs-zkfc</name>
+            </package>
+            <package>
+              <name>libsnappy1</name>
+            </package>
+            <package>
+              <name>libsnappy-dev</name>
+            </package>
+            <package>
+              <name>liblzo2-2</name>
+            </package>
+            <package>
+              <name>libhdfs0-2-2-0-0-.*</name>
+            </package>
+          </packages>
+        </osSpecific>
       </osSpecifics>
 
     </service>

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

@@ -26,10 +26,15 @@
           <osFamily>any</osFamily>
           <packages>
             <package>
-              <name>hive_2_2_0_0_*</name>
+              <name>mysql-connector-java</name>
             </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
+          <packages>
             <package>
-              <name>mysql-connector-java</name>
+              <name>hive_2_2_0_0_*</name>
             </package>
             <package>
               <name>hive_2_2_0_0_*-hcatalog</name>
@@ -37,13 +42,22 @@
             <package>
               <name>hive_2_2_0_0_*-webhcat</name>
             </package>
+            <package>
+              <name>mysql</name>
+            </package>
           </packages>
         </osSpecific>
         <osSpecific>
-          <osFamily>redhat5,redhat6,suse11</osFamily>
+          <osFamily>ubuntu12</osFamily>
           <packages>
             <package>
-              <name>mysql</name>
+              <name>hive-2-2-0-0-.*</name>
+            </package>
+            <package>
+              <name>hive-2-2-0-0-.*-hcatalog</name>
+            </package>
+            <package>
+              <name>hive-2-2-0-0-.*-webhcat</name>
             </package>
           </packages>
         </osSpecific>

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

@@ -47,13 +47,21 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osFamily>any</osFamily>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
               <name>kafka_2_2_0_0_*</name>
             </package>
           </packages>
         </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>kafka-2-2-0-0-.*</name>
+            </package>
+          </packages>
+        </osSpecific>
       </osSpecifics>
       <commandScript>
         <script>scripts/service_check.py</script>

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

@@ -55,13 +55,21 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osFamily>any</osFamily>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
               <name>knox_2_2_0_0_*</name>
             </package>
           </packages>
         </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>knox-2-2-0-0-.*</name>
+            </package>
+          </packages>
+        </osSpecific>
       </osSpecifics>
       <commandScript>
         <script>scripts/service_check.py</script>

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

@@ -26,22 +26,35 @@
           <osFamily>any</osFamily>
           <packages>
             <package>
-              <name>oozie_2_2_0_0_*</name>
+              <name>zip</name>
             </package>
             <package>
-              <name>oozie_2_2_0_0_*-client</name>
+              <name>mysql-connector-java</name>
             </package>
             <package>
-              <name>falcon_2_2_0_0_*</name>
+              <name>extjs</name>
             </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
+          <packages>
             <package>
-              <name>zip</name>
+              <name>oozie_2_2_0_0_*</name>
             </package>
             <package>
-              <name>mysql-connector-java</name>
+              <name>falcon_2_2_0_0_*</name>
+            </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>oozie-2-2-0-0-.*</name>
             </package>
             <package>
-              <name>extjs</name>
+              <name>falcon-2-2-0-0-.*</name>
             </package>
           </packages>
         </osSpecific>

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

@@ -24,13 +24,21 @@
       <version>0.14.0.2.2.0.0</version>
       <osSpecifics>
         <osSpecific>
-          <osFamily>any</osFamily>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
               <name>pig_2_2_0_0_*</name>
             </package>
           </packages>
         </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>pig-2-2-0-0-.*</name>
+            </package>
+          </packages>
+        </osSpecific>
       </osSpecifics>
     </service>
   </services>

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

@@ -86,13 +86,21 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osFamily>any</osFamily>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
               <name>slider_2_2_0_0_*</name>
             </package>
           </packages>
         </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>slider-2-2-0-0-.*</name>
+            </package>
+          </packages>
+        </osSpecific>
       </osSpecifics>
 
       <commandScript>

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

@@ -24,12 +24,25 @@
       <osSpecifics>
         <osSpecific>
           <osFamily>any</osFamily>
+          <packages>
+            <package>
+              <name>mysql-connector-java</name>
+            </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
               <name>sqoop_2_2_0_0_*</name>
             </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
             <package>
-              <name>mysql-connector-java</name>
+              <name>sqoop-2-2-0-0-.*</name>
             </package>
           </packages>
         </osSpecific>

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

@@ -31,13 +31,21 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osFamily>any</osFamily>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
               <name>storm_2_2_0_0_*</name>
             </package>
           </packages>
         </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>storm-2-2-0-0-.*</name>
+            </package>
+          </packages>
+        </osSpecific>
       </osSpecifics>
     </service>
   </services>

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

@@ -25,13 +25,21 @@
 
       <osSpecifics>
         <osSpecific>
-          <osFamily>any</osFamily>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
               <name>tez_2_2_0_0_*</name>
             </package>
           </packages>
         </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>tez-2-2-0-0-.*</name>
+            </package>
+          </packages>
+        </osSpecific>
       </osSpecifics>
 
     </service>

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

@@ -32,7 +32,7 @@
       
       <osSpecifics>
         <osSpecific>
-          <osFamily>any</osFamily>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
               <name>hadoop_2_2_0_0_*-yarn</name>
@@ -42,6 +42,17 @@
             </package>
           </packages>
         </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>hadoop-2-2-0-0-.*-yarn</name>
+            </package>
+            <package>
+              <name>hadoop-2-2-0-0-.*-mapreduce</name>
+            </package>
+          </packages>
+        </osSpecific>
       </osSpecifics>
     </service>
 
@@ -51,13 +62,21 @@
       <version>2.6.0.2.2.0.0</version>
       <osSpecifics>
         <osSpecific>
-          <osFamily>any</osFamily>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
               <name>hadoop_2_2_0_0_*-mapreduce</name>
             </package>
           </packages>
         </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>hadoop-2-2-0-0-.*-mapreduce</name>
+            </package>
+          </packages>
+        </osSpecific>
       </osSpecifics>
       <configuration-dir>configuration-mapred</configuration-dir>
 

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

@@ -25,13 +25,21 @@
 
       <osSpecifics>
         <osSpecific>
-          <osFamily>any</osFamily>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
               <name>zookeeper_2_2_0_0_*</name>
             </package>
           </packages>
         </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>zookeeper-2-2-0-0-.*</name>
+            </package>
+          </packages>
+        </osSpecific>
       </osSpecifics>
 
     </service>