Browse Source

AMBARI-4880. Nagios metainfo.xml needs some corrections.(vbrodetskyi)

Vitaly Brodetskyi 11 years ago
parent
commit
925df0341f

+ 34 - 17
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml

@@ -73,32 +73,49 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>suse</osType>
-          <package>
-            <type>rpm</type>
-            <name>php5-json</name>
-          </package>
+          <osType>suse11</osType>
+          <packages>
+            <package>
+              <type>rpm</type>
+              <name>php5-json</name>
+            </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osType>sles11</osType>
+          <packages>
+            <package>
+              <type>rpm</type>
+              <name>php5-json</name>
+            </package>
+          </packages>
         </osSpecific>
         <osSpecific>
           <osType>centos5</osType>
-          <package>
-            <type>rpm</type>
-            <name>php-pecl-json.x86_64</name>
-          </package>
+          <packages>
+            <package>
+              <type>rpm</type>
+              <name>php-pecl-json.x86_64</name>
+            </package>
+          </packages>
         </osSpecific>
         <osSpecific>
           <osType>redhat5</osType>
-          <package>
-            <type>rpm</type>
-            <name>php-pecl-json.x86_64</name>
-          </package>
+          <packages>
+            <package>
+              <type>rpm</type>
+              <name>php-pecl-json.x86_64</name>
+            </package>
+          </packages>
         </osSpecific>
         <osSpecific>
           <osType>oraclelinux5</osType>
-          <package>
-            <type>rpm</type>
-            <name>php-pecl-json.x86_64</name>
-          </package>
+          <packages>
+            <package>
+              <type>rpm</type>
+              <name>php-pecl-json.x86_64</name>
+            </package>
+          </packages>
         </osSpecific>
       </osSpecifics>
     </service>

+ 10 - 1
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml

@@ -72,7 +72,16 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>suse</osType>
+          <osType>suse11</osType>
+          <packages>
+            <package>
+              <type>rpm</type>
+              <name>php5-json</name>
+            </package>
+          </packages>
+        </osSpecific>
+        <osSpecific>
+          <osType>sles11</osType>
           <packages>
             <package>
               <type>rpm</type>