Repository: ambari Updated Branches: refs/heads/trunk 542bbf22e -> e8f2f2fd7
AMBARI-13070: HDP-specific list of packages should be removed from common-services (jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8f2f2fd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8f2f2fd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8f2f2fd Branch: refs/heads/trunk Commit: e8f2f2fd767bab5fff67c163d672ee7fdf2d5054 Parents: 542bbf2 Author: Jayush Luniya <[email protected]> Authored: Fri Sep 11 12:45:41 2015 -0700 Committer: Jayush Luniya <[email protected]> Committed: Fri Sep 11 12:45:41 2015 -0700 ---------------------------------------------------------------------- .../configs/SAPHD.json | 4 -- .../resources/PHD/custom_stack_map.js | 2 +- .../ambari-metrics-storm-sink/pom.xml | 2 +- .../KAFKA/0.8.1.2.2/metainfo.xml | 18 -------- .../common-services/KNOX/0.5.0.2.2/metainfo.xml | 18 -------- .../OOZIE/4.2.0.2.3/metainfo.xml | 47 -------------------- .../common-services/RANGER/0.4.0/metainfo.xml | 25 ----------- .../RANGER_KMS/0.5.0.2.3/metainfo.xml | 21 +-------- .../SLIDER/0.60.0.2.2/metainfo.xml | 24 ---------- .../SPARK/1.2.0.2.2/metainfo.xml | 25 ----------- .../SPARK/1.3.1.2.3/metainfo.xml | 25 ----------- .../stacks/HDP/2.2/services/KAFKA/metainfo.xml | 18 ++++++++ .../stacks/HDP/2.2/services/KNOX/metainfo.xml | 18 ++++++++ .../stacks/HDP/2.2/services/RANGER/metainfo.xml | 26 ++++++++++- .../stacks/HDP/2.2/services/SLIDER/metainfo.xml | 24 ++++++++++ .../stacks/HDP/2.2/services/SPARK/metainfo.xml | 40 +++++++++++++---- .../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 46 +++++++++++++++++++ .../HDP/2.3/services/RANGER_KMS/metainfo.xml | 18 ++++++++ .../stacks/HDP/2.3/services/SPARK/metainfo.xml | 2 +- 19 files changed, 185 insertions(+), 218 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json b/ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json index 37de54d..3ef46d8 100644 --- a/ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json +++ b/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" http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-common/src/main/python/pluggable_stack_definition/resources/PHD/custom_stack_map.js ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/pluggable_stack_definition/resources/PHD/custom_stack_map.js b/ambari-common/src/main/python/pluggable_stack_definition/resources/PHD/custom_stack_map.js index 1834ead..997e223 100644 --- a/ambari-common/src/main/python/pluggable_stack_definition/resources/PHD/custom_stack_map.js +++ b/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" }, http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-metrics/ambari-metrics-storm-sink/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-storm-sink/pom.xml b/ambari-metrics/ambari-metrics-storm-sink/pom.xml index 8386cae..5dd32d4 100644 --- a/ambari-metrics/ambari-metrics-storm-sink/pom.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml index bf5f51d..dcfe520 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/metainfo.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/metainfo.xml index 6a61ef6..34f55ff 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/metainfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml index 2a49671..f12d695 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml index 5b50c83..eac60f9 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml index a0856da..74c5697 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/metainfo.xml b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/metainfo.xml index 2902f93..a2002f1 100644 --- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/metainfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/metainfo.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/metainfo.xml index b6eaa5b..f84fb73 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/metainfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/common-services/SPARK/1.3.1.2.3/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.3.1.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/SPARK/1.3.1.2.3/metainfo.xml index 3f391a4..306d16c 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.3.1.2.3/metainfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml index 24e4ac8..aa164e3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml index e3adf17..481fca9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml index 4d8a806..1d03eac 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml +++ b/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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml index d0e1346..47bb207 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml index 4331a6f..db11d05 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml index 8d19827..ccf5de3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml +++ b/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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml index 00a6038..b1a5584 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml +++ b/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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f2f2fd/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml index 6e9f593..26c2dff 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml +++ b/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>
