Repository: ambari Updated Branches: refs/heads/trunk 878c9319b -> 462ade7dd
AMBARI-5397. Capture default client assignments as part of stack definition. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/462ade7d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/462ade7d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/462ade7d Branch: refs/heads/trunk Commit: 462ade7dd36eaa29c0cffc15e182da74648140b7 Parents: 878c931 Author: Siddharth Wagle <[email protected]> Authored: Fri Apr 25 12:42:08 2014 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Fri Apr 25 13:03:36 2014 -0700 ---------------------------------------------------------------------- .../stacks/HDP/1.3.2/services/HIVE/metainfo.xml | 7 +++ .../HDP/1.3.2/services/NAGIOS/metainfo.xml | 46 ++++++++++++--- .../HDP/2.0.6/services/HBASE/metainfo.xml | 18 ++++++ .../stacks/HDP/2.0.6/services/HIVE/metainfo.xml | 44 +++++++++++++++ .../HDP/2.0.6/services/NAGIOS/metainfo.xml | 59 +++++++++++++++++--- .../HDP/2.0.6/services/OOZIE/metainfo.xml | 41 ++++++++++++++ .../stacks/HDP/2.0.6/services/PIG/metainfo.xml | 1 + .../HDP/2.0.6/services/SQOOP/metainfo.xml | 17 ++++++ .../HDP/2.0.6/services/WEBHCAT/metainfo.xml | 39 +++++++++++++ .../stacks/HDP/2.0.6/services/YARN/metainfo.xml | 18 ++++++ .../HDP/2.0.6/services/ZOOKEEPER/metainfo.xml | 2 + 11 files changed, 277 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/462ade7d/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml index c35bae9..8d1b9b9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml @@ -53,6 +53,13 @@ <co-locate>HIVE/HIVE_SERVER</co-locate> </auto-deploy> </dependency> + <dependency> + <name>MAPREDUCE/MAPREDUCE_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> </dependencies> <commandScript> <script>scripts/hive_server.py</script> http://git-wip-us.apache.org/repos/asf/ambari/blob/462ade7d/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml index 55d36b7..a90b33a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml @@ -24,14 +24,44 @@ <version>3.5.0</version> <components> <component> - <name>NAGIOS_SERVER</name> - <category>MASTER</category> - <cardinality>1</cardinality> - <commandScript> - <script>scripts/nagios_server.py</script> - <scriptType>PYTHON</scriptType> - <timeout>600</timeout> - </commandScript> + <name>NAGIOS_SERVER</name> + <category>MASTER</category> + <cardinality>1</cardinality> + <dependencies> + <dependency> + <name>HDFS/HDFS_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>MAPREDUCE/MAPREDUCE_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>OOZIE/OOZIE_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>HCATALOG/HCAT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + </dependencies> + <commandScript> + <script>scripts/nagios_server.py</script> + <scriptType>PYTHON</scriptType> + <timeout>600</timeout> + </commandScript> </component> </components> <osSpecifics> http://git-wip-us.apache.org/repos/asf/ambari/blob/462ade7d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml index 41e79e9..6842c38 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml @@ -28,6 +28,24 @@ <component> <name>HBASE_MASTER</name> <category>MASTER</category> + <cardinality>1</cardinality> + <dependencies> + <dependency> + <name>HDFS/HDFS_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>ZOOKEEPER/ZOOKEEPER_SERVER</name> + <scope>cluster</scope> + <auto-deploy> + <enabled>true</enabled> + <co-locate>HBASE/HBASE_MASTER</co-locate> + </auto-deploy> + </dependency> + </dependencies> <commandScript> <script>scripts/hbase_master.py</script> <scriptType>PYTHON</scriptType> http://git-wip-us.apache.org/repos/asf/ambari/blob/462ade7d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml index 02e6dc1..2d90f52 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml @@ -27,6 +27,12 @@ <component> <name>HIVE_METASTORE</name> <category>MASTER</category> + <!-- may be 0 if specifying external metastore, how to specify this? --> + <cardinality>1</cardinality> + <auto-deploy> + <enabled>true</enabled> + <co-locate>HIVE/HIVE_SERVER</co-locate> + </auto-deploy> <commandScript> <script>scripts/hive_metastore.py</script> <scriptType>PYTHON</scriptType> @@ -37,6 +43,38 @@ <component> <name>HIVE_SERVER</name> <category>MASTER</category> + <cardinality>1</cardinality> + <dependencies> + <dependency> + <name>ZOOKEEPER/ZOOKEEPER_SERVER</name> + <scope>cluster</scope> + <auto-deploy> + <enabled>true</enabled> + <co-locate>HIVE/HIVE_SERVER</co-locate> + </auto-deploy> + </dependency> + <dependency> + <name>TEZ/TEZ_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>YARN/YARN_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + </dependencies> <commandScript> <script>scripts/hive_server.py</script> <scriptType>PYTHON</scriptType> @@ -46,6 +84,12 @@ <component> <name>MYSQL_SERVER</name> <category>MASTER</category> + <!-- may be 0 if specifying external db, how to specify this? --> + <cardinality>1</cardinality> + <auto-deploy> + <enabled>true</enabled> + <co-locate>HIVE/HIVE_SERVER</co-locate> + </auto-deploy> <commandScript> <script>scripts/mysql_server.py</script> <scriptType>PYTHON</scriptType> http://git-wip-us.apache.org/repos/asf/ambari/blob/462ade7d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml index 03f0276..da06b24 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml @@ -24,13 +24,58 @@ <version>3.5.0</version> <components> <component> - <name>NAGIOS_SERVER</name> - <category>MASTER</category> - <commandScript> - <script>scripts/nagios_server.py</script> - <scriptType>PYTHON</scriptType> - <timeout>600</timeout> - </commandScript> + <name>NAGIOS_SERVER</name> + <category>MASTER</category> + <cardinality>1</cardinality> + <dependencies> + <dependency> + <name>HDFS/HDFS_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>OOZIE/OOZIE_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>YARN/YARN_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>TEZ/TEZ_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>HCATALOG/HCAT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + </dependencies> + <commandScript> + <script>scripts/nagios_server.py</script> + <scriptType>PYTHON</scriptType> + <timeout>600</timeout> + </commandScript> </component> </components> <osSpecifics> http://git-wip-us.apache.org/repos/asf/ambari/blob/462ade7d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml index 07da285..b56bb49 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml @@ -27,6 +27,30 @@ <component> <name>OOZIE_SERVER</name> <category>MASTER</category> + <cardinality>1</cardinality> + <dependencies> + <dependency> + <name>HDFS/HDFS_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>YARN/YARN_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + </dependencies> <commandScript> <script>scripts/oozie_server.py</script> <scriptType>PYTHON</scriptType> @@ -37,6 +61,23 @@ <component> <name>OOZIE_CLIENT</name> <category>CLIENT</category> + <cardinality>0+</cardinality> + <dependencies> + <dependency> + <name>HDFS/HDFS_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + </dependencies> <commandScript> <script>scripts/oozie_client.py</script> <scriptType>PYTHON</scriptType> http://git-wip-us.apache.org/repos/asf/ambari/blob/462ade7d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml index 07fdc6d..7db411b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml @@ -26,6 +26,7 @@ <component> <name>PIG</name> <category>CLIENT</category> + <cardinality>0+</cardinality> <commandScript> <script>scripts/pig_client.py</script> <scriptType>PYTHON</scriptType> http://git-wip-us.apache.org/repos/asf/ambari/blob/462ade7d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml index 798dde0..50e3e77 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml @@ -29,6 +29,23 @@ <component> <name>SQOOP</name> <category>CLIENT</category> + <cardinality>0+</cardinality> + <dependencies> + <dependency> + <name>HDFS/HDFS_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + </dependencies> <commandScript> <script>scripts/sqoop_client.py</script> <scriptType>PYTHON</scriptType> http://git-wip-us.apache.org/repos/asf/ambari/blob/462ade7d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml index 433b7b6..63cff93 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml @@ -26,6 +26,45 @@ <component> <name>WEBHCAT_SERVER</name> <category>MASTER</category> + <cardinality>1</cardinality> + <dependencies> + <dependency> + <name>HDFS/HDFS_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>ZOOKEEPER/ZOOKEEPER_SERVER</name> + <scope>cluster</scope> + <auto-deploy> + <enabled>true</enabled> + <co-locate>WEBHCAT/WEBHCAT_SERVER</co-locate> + </auto-deploy> + </dependency> + <dependency> + <name>ZOOKEEPER/ZOOKEEPER_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + <dependency> + <name>YARN/YARN_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + </dependencies> <commandScript> <script>scripts/webhcat_server.py</script> <scriptType>PYTHON</scriptType> http://git-wip-us.apache.org/repos/asf/ambari/blob/462ade7d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml index beb94a0..87619dd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml @@ -28,6 +28,7 @@ <component> <name>RESOURCEMANAGER</name> <category>MASTER</category> + <cardinality>1</cardinality> <commandScript> <script>scripts/resourcemanager.py</script> <scriptType>PYTHON</scriptType> @@ -48,6 +49,7 @@ <component> <name>NODEMANAGER</name> <category>SLAVE</category> + <cardinality>1+</cardinality> <commandScript> <script>scripts/nodemanager.py</script> <scriptType>PYTHON</scriptType> @@ -58,6 +60,7 @@ <component> <name>YARN_CLIENT</name> <category>CLIENT</category> + <cardinality>0+</cardinality> <commandScript> <script>scripts/yarn_client.py</script> <scriptType>PYTHON</scriptType> @@ -119,6 +122,20 @@ <component> <name>HISTORYSERVER</name> <category>MASTER</category> + <cardinality>1</cardinality> + <auto-deploy> + <enabled>true</enabled> + <co-locate>YARN/RESOURCEMANAGER</co-locate> + </auto-deploy> + <dependencies> + <dependency> + <name>HDFS/HDFS_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> + </dependencies> <commandScript> <script>scripts/historyserver.py</script> <scriptType>PYTHON</scriptType> @@ -129,6 +146,7 @@ <component> <name>MAPREDUCE2_CLIENT</name> <category>CLIENT</category> + <cardinality>0+</cardinality> <commandScript> <script>scripts/mapreduce2_client.py</script> <scriptType>PYTHON</scriptType> http://git-wip-us.apache.org/repos/asf/ambari/blob/462ade7d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml index 2d0e626..274a328 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml @@ -27,6 +27,7 @@ <component> <name>ZOOKEEPER_SERVER</name> <category>MASTER</category> + <cardinality>1</cardinality> <commandScript> <script>scripts/zookeeper_server.py</script> <scriptType>PYTHON</scriptType> @@ -37,6 +38,7 @@ <component> <name>ZOOKEEPER_CLIENT</name> <category>CLIENT</category> + <cardinality>0+</cardinality> <commandScript> <script>scripts/zookeeper_client.py</script> <scriptType>PYTHON</scriptType>
