diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/metainfo.xml index 4f6bbd98709..15a764d62bb 100644 --- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/metainfo.xml +++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/metainfo.xml @@ -55,7 +55,10 @@ - HDFS + + HDFS + INSTALL + diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml index 4f6bbd98709..15a764d62bb 100644 --- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml +++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml @@ -55,7 +55,10 @@ - HDFS + + HDFS + INSTALL + diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml index acd355689da..e63ac7faf47 100644 --- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml +++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml @@ -118,8 +118,14 @@ 50 - HDFS - TEZ + + HDFS + INSTALL + + + TEZ + INSTALL + global diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml index fe3b8603186..5aff41c90e2 100644 --- a/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml +++ b/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml @@ -116,7 +116,10 @@ - ZOOKEEPER + + ZOOKEEPER + INSTALL + diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceResponse.java index fd67fec94c9..6c3af8792d2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceResponse.java @@ -26,6 +26,7 @@ import java.util.Set; import org.apache.ambari.server.state.CustomCommandDefinition; +import org.apache.ambari.server.state.RequiredService; import org.apache.ambari.server.state.ServiceInfo; import io.swagger.annotations.ApiModelProperty; @@ -48,7 +49,7 @@ public class StackServiceResponse { private Set excludedConfigTypes; - private List requiredServices; + private List requiredServices; private Map serviceProperties; @@ -208,11 +209,11 @@ public Set getExcludedConfigTypes() { } @ApiModelProperty(name = "required_services") - public List getRequiredServices() { + public List getRequiredServices() { return requiredServices; } - public void setRequiredServices(List requiredServices) { + public void setRequiredServices(List requiredServices) { this.requiredServices = requiredServices; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/RequiredService.java b/ambari-server/src/main/java/org/apache/ambari/server/state/RequiredService.java new file mode 100644 index 00000000000..f456c6cd1c9 --- /dev/null +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/RequiredService.java @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ambari.server.state; + + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; + +/** + * Required service + * Is defined for some services in the service level metainfo.xml + * Specifies required service name and scope + */ +@XmlAccessorType(XmlAccessType.FIELD) +public class RequiredService { + + public RequiredService() { + } + + public RequiredService(String name) { + this.name = name; + } + + public RequiredService(String name, Scope scope) { + this.name = name; + this.scope = scope; + } + + /** + * Required service name + */ + private String name; + /** + * Required service scope + * By default is set to INSTALL + */ + private Scope scope = Scope.INSTALL; + + public String getName() { + return name; + } + + public Scope getScope() { + return scope; + } + + /** + * Scope of the required service + * We could have an INSTALL time dependency (i.e. we should also install the dependent service) + * or a RUNTIME dependency (i.e. there should be a running instance of the service in the cluster) + */ + public enum Scope { + /** + * We should also install the dependent service. Is used as a default scope + */ + INSTALL, + + /** + * There should be a running instance of the service in the cluster + */ + RUNTIME + } +} + diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java index 618a9a5c055..943b8268a98 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java @@ -284,7 +284,7 @@ public void addErrors(Collection errors) { @XmlElementWrapper(name="requiredServices") @XmlElement(name="service") - private List requiredServices = new ArrayList<>(); + private List requiredServices = new ArrayList<>(); /** * Meaning: stores subpath from stack root to exact directory, that contains @@ -417,7 +417,7 @@ public String getComment() { public void setComment(String comment) { this.comment = comment; } - public List getRequiredServices() { + public List getRequiredServices() { return requiredServices; } @@ -437,7 +437,7 @@ public void setMetricsFileName(String metricsFileName) { this.metricsFileName = metricsFileName; } - public void setRequiredServices(List requiredServices) { + public void setRequiredServices(List requiredServices) { this.requiredServices = requiredServices; } public List getProperties() { diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/metainfo.xml index e7c9b52a0cc..b2eb74e8438 100644 --- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/metainfo.xml @@ -195,8 +195,14 @@ - ZOOKEEPER - HDFS + + ZOOKEEPER + INSTALL + + + HDFS + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/metainfo.xml b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/metainfo.xml index 1c5bf6e81c3..5459548c37e 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/metainfo.xml @@ -130,7 +130,10 @@ - ZOOKEEPER + + ZOOKEEPER + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml index d563becebe3..7802cd77ffb 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml @@ -221,7 +221,10 @@ - ZOOKEEPER + + ZOOKEEPER + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/metainfo.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/metainfo.xml index f12ccdedf13..09fedc69bf5 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/metainfo.xml @@ -61,7 +61,10 @@ - KAFKA + + KAFKA + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/metainfo.xml index 11ebf45dcf1..5c9a1d961c4 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/metainfo.xml @@ -119,7 +119,10 @@ - KAFKA + + KAFKA + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/metainfo.xml b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/metainfo.xml index 53dee2ba042..9517e65db59 100644 --- a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/metainfo.xml @@ -201,7 +201,10 @@ 300 - ZOOKEEPER + + ZOOKEEPER + INSTALL + druid-common diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml index 2cda70a9057..bbf4a01eb3e 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml @@ -114,7 +114,10 @@ - OOZIE + + OOZIE + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml index 86c9c8a20cd..d0f2da18f7f 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml @@ -158,7 +158,10 @@ - HDFS + + HDFS + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metainfo.xml index dcbf79a6cc1..0b1c36d1b7d 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metainfo.xml @@ -151,8 +151,14 @@ - ZOOKEEPER - HDFS + + ZOOKEEPER + INSTALL + + + HDFS + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/metainfo.xml index ac576930186..36492ddc459 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/metainfo.xml @@ -170,8 +170,14 @@ - ZOOKEEPER - HDFS + + ZOOKEEPER + INSTALL + + + HDFS + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml index c2c818935a0..49a2ce8d513 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml @@ -330,9 +330,18 @@ - ZOOKEEPER - YARN - TEZ + + ZOOKEEPER + INSTALL + + + YARN + INSTALL + + + TEZ + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/metainfo.xml index 48dda31b74d..fcdd7c1f74f 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/metainfo.xml @@ -487,15 +487,30 @@ - ZOOKEEPER - HDFS - YARN - TEZ + + ZOOKEEPER + INSTALL + + + HDFS + INSTALL + + + YARN + INSTALL + + + TEZ + INSTALL + + + SLIDER + INSTALL + - SLIDER diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/metainfo.xml index 164e15fb60b..f471565a200 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/metainfo.xml @@ -71,7 +71,10 @@ 300 - ZOOKEEPER + + ZOOKEEPER + INSTALL + kafka-broker diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/metainfo.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/metainfo.xml index 6d44d4a52b0..d7fb1edd606 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/metainfo.xml @@ -71,7 +71,10 @@ 300 - ZOOKEEPER + + ZOOKEEPER + INSTALL + kafka-broker diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml index f363e556851..6ca7a85a58c 100644 --- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml @@ -66,7 +66,10 @@ - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml index eff162ee61a..a6420d9380c 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml @@ -154,7 +154,10 @@ - YARN + + YARN + INSTALL + 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 fca2bba4135..29bf52cffec 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 @@ -161,7 +161,10 @@ - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/metainfo.xml index 11ef8537982..600ca2ae8a3 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/metainfo.xml @@ -167,7 +167,10 @@ - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/metainfo.xml index d445e58d145..d51c738cae1 100644 --- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/metainfo.xml @@ -72,7 +72,10 @@ - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/PIG/0.16.1.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/PIG/0.16.1.3.0/metainfo.xml index 041255aea37..beb102833a9 100644 --- a/ambari-server/src/main/resources/common-services/PIG/0.16.1.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/PIG/0.16.1.3.0/metainfo.xml @@ -86,8 +86,14 @@ - YARN - TEZ + + YARN + INSTALL + + + TEZ + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml b/ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml index d41c030454a..28966bf7fb0 100644 --- a/ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml @@ -43,7 +43,10 @@ - HAWQ + + HAWQ + INSTALL + 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 bc0aa7435d6..23178525e94 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 @@ -76,8 +76,14 @@ - RANGER - HDFS + + RANGER + INSTALL + + + HDFS + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/metainfo.xml index d328d892b1b..bf27ded86fa 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/metainfo.xml @@ -95,8 +95,14 @@ - RANGER - HDFS + + RANGER + INSTALL + + + HDFS + INSTALL + 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 f1552e0d757..9668f79441d 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 @@ -93,9 +93,18 @@ - YARN - HDFS - ZOOKEEPER + + HDFS + INSTALL + + + YARN + INSTALL + + + ZOOKEEPER + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/metainfo.xml index 168a2dfb9e0..9521a364dfd 100644 --- a/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/metainfo.xml @@ -93,9 +93,18 @@ - YARN - HDFS - ZOOKEEPER + + YARN + INSTALL + + + HDFS + INSTALL + + + ZOOKEEPER + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/metainfo.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/metainfo.xml index 1a35793e792..f1f330a4f02 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/metainfo.xml @@ -147,8 +147,14 @@ - YARN - TEZ + + YARN + INSTALL + + + TEZ + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.3.1/metainfo.xml b/ambari-server/src/main/resources/common-services/SPARK/1.3.1/metainfo.xml index e56ef145d0f..8a81f6bda86 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.3.1/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.3.1/metainfo.xml @@ -135,7 +135,10 @@ - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.4.1/metainfo.xml b/ambari-server/src/main/resources/common-services/SPARK/1.4.1/metainfo.xml index bc9f7a474ae..7eac20de13b 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.4.1/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.4.1/metainfo.xml @@ -93,7 +93,10 @@ - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.5.2/metainfo.xml b/ambari-server/src/main/resources/common-services/SPARK/1.5.2/metainfo.xml index 24a99227ad7..4ec326a8b98 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.5.2/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.5.2/metainfo.xml @@ -26,7 +26,10 @@ 1.5.2 common-services/SPARK/1.4.1 - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.6.0/metainfo.xml b/ambari-server/src/main/resources/common-services/SPARK/1.6.0/metainfo.xml index 9923424b699..93eeff56597 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.6.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.6.0/metainfo.xml @@ -36,9 +36,18 @@ spark-thrift-fairscheduler - HDFS - YARN - HIVE + + HDFS + INSTALL + + + YARN + INSTALL + + + HIVE + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/SPARK/2.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/metainfo.xml index d2e2d8b3729..cb740624bc5 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/2.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/metainfo.xml @@ -235,9 +235,18 @@ - HDFS - YARN - HIVE + + HDFS + INSTALL + + + YARN + INSTALL + + + HIVE + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/metainfo.xml b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/metainfo.xml index 324746a78fe..eb9f37134b0 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/metainfo.xml @@ -191,9 +191,18 @@ - HDFS - YARN - HIVE + + HDFS + INSTALL + + + YARN + INSTALL + + + HIVE + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/metainfo.xml index 56071ec57c2..39a62e3e90b 100644 --- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/metainfo.xml @@ -84,7 +84,10 @@ - HDFS + + HDFS + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/metainfo.xml index e02d9f41acd..9a1e5ee3721 100644 --- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/metainfo.xml @@ -92,7 +92,10 @@ - HDFS + + HDFS + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/metainfo.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1/metainfo.xml index e97300ec634..d22fb4233c2 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/metainfo.xml @@ -153,7 +153,10 @@ - ZOOKEEPER + + ZOOKEEPER + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/metainfo.xml index 36dddd1eefb..1defdc45207 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/metainfo.xml @@ -148,7 +148,10 @@ - ZOOKEEPER + + ZOOKEEPER + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/metainfo.xml b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/metainfo.xml index 8b3a153eecf..938205a2949 100644 --- a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/metainfo.xml @@ -90,7 +90,10 @@ - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/TEZ/0.9.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/TEZ/0.9.0.3.0/metainfo.xml index 8ca01f35a85..cff6571ad90 100644 --- a/ambari-server/src/main/resources/common-services/TEZ/0.9.0.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/TEZ/0.9.0.3.0/metainfo.xml @@ -98,7 +98,10 @@ - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml index da9a357a78f..27c48939e99 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml @@ -163,9 +163,18 @@ - HDFS - MAPREDUCE2 - ZOOKEEPER + + HDFS + INSTALL + + + MAPREDUCE2 + INSTALL + + + ZOOKEEPER + INSTALL + @@ -287,7 +296,10 @@ - YARN + + YARN + INSTALL + configuration-mapred diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml index 061587d3651..cbf0c60372b 100644 --- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml @@ -212,9 +212,18 @@ - HDFS - MAPREDUCE2 - ZOOKEEPER + + HDFS + INSTALL + + + MAPREDUCE2 + INSTALL + + + ZOOKEEPER + INSTALL + @@ -355,7 +364,10 @@ - YARN + + YARN + INSTALL + themes-mapred diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/metainfo.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/metainfo.xml index 597b6db42c9..88f92f57efe 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/metainfo.xml @@ -81,7 +81,10 @@ limitations under the License. - HDFS + + HDFS + INSTALL + diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/metainfo.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/metainfo.xml index 891d1f5fa50..5d1fb547518 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/metainfo.xml @@ -81,7 +81,10 @@ limitations under the License. - HDFS + + HDFS + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/metainfo.xml index f15ad9aad90..db43ae222da 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/metainfo.xml @@ -55,7 +55,10 @@ - HDFS + + HDFS + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/metainfo.xml index 00d7cf9cb46..dfe7b1746b3 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/metainfo.xml @@ -135,8 +135,14 @@ - ZOOKEEPER - HDFS + + ZOOKEEPER + INSTALL + + + HDFS + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/metainfo.xml index 85008396929..37775379e61 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/metainfo.xml @@ -244,7 +244,10 @@ - ZOOKEEPER + + ZOOKEEPER + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/metainfo.xml index d9ee0a32316..2be687f2416 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/metainfo.xml @@ -271,7 +271,10 @@ - ZOOKEEPER + + ZOOKEEPER + INSTALL + YARN diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/metainfo.xml index 83826626168..afb9bbd65d6 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/metainfo.xml @@ -142,7 +142,10 @@ - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/metainfo.xml index 8bf6f16611f..e9e0210dc96 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/metainfo.xml @@ -71,7 +71,10 @@ - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/metainfo.xml index 7f76b8b6ec8..8e899a4c228 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/metainfo.xml @@ -168,7 +168,10 @@ - HDFS + + HDFS + INSTALL + @@ -264,7 +267,10 @@ - YARN + + YARN + INSTALL + configuration-mapred diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/metainfo.xml index 8580abde51e..084f559c649 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/metainfo.xml @@ -26,9 +26,15 @@ 0.96.1.2.0.6.1 - ZOOKEEPER - GLUSTERFS - + + ZOOKEEPER + INSTALL + + + GLUSTERFS + INSTALL + + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/SQOOP/metainfo.xml index 4db6892cfaf..26814ac5579 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/SQOOP/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/SQOOP/metainfo.xml @@ -25,8 +25,11 @@ 1.4.4.2.0.6.0 - GLUSTERFS - + + GLUSTERFS + INSTALL + + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/metainfo.xml index 695b33f09b3..9fcc8b2f5bf 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/metainfo.xml @@ -56,7 +56,10 @@ - GLUSTERFS + + GLUSTERFS + INSTALL + @@ -128,7 +131,10 @@ configuration-mapred - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/metainfo.xml index d9422290cd3..4584a1cbe9d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/metainfo.xml @@ -89,7 +89,10 @@ - OOZIE + + OOZIE + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FLUME/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FLUME/metainfo.xml index 98c3b519a4f..64d585ba9ad 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FLUME/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FLUME/metainfo.xml @@ -24,8 +24,11 @@ 1.4.0.2.1 - GLUSTERFS - + + GLUSTERFS + INSTALL + + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HBASE/metainfo.xml index f5660d25359..3655541354c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HBASE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HBASE/metainfo.xml @@ -26,9 +26,15 @@ 0.98.0.2.1 - ZOOKEEPER - GLUSTERFS - + + ZOOKEEPER + INSTALL + + + GLUSTERFS + INSTALL + + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/SQOOP/metainfo.xml index f6c7fe5185c..01bb1582223 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/SQOOP/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/SQOOP/metainfo.xml @@ -25,7 +25,10 @@ 1.4.4.2.1 - GLUSTERFS + + GLUSTERFS + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/metainfo.xml index c5a9dffa614..aeedb579e1e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/metainfo.xml @@ -60,7 +60,10 @@ - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml index 50c9818c963..e56873862e3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml @@ -55,7 +55,10 @@ - GLUSTERFS + + GLUSTERFS + INSTALL + @@ -127,7 +130,10 @@ configuration-mapred - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml index 49a4e692367..3c83da26fed 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml @@ -139,7 +139,10 @@ - PIG + + PIG + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml index f2cfb3039ca..23c9dfd6592 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml @@ -41,7 +41,10 @@ - TEZ + + TEZ + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/metainfo.xml index 16fb847ea0c..68855893112 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/metainfo.xml @@ -49,8 +49,14 @@ - ZOOKEEPER - ECS + + ZOOKEEPER + INSTALL + + + ECS + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HIVE/metainfo.xml index ff24b71b03e..40192cf7ce0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HIVE/metainfo.xml @@ -80,9 +80,18 @@ - ZOOKEEPER - YARN - TEZ + + ZOOKEEPER + INSTALL + + + YARN + INSTALL + + + TEZ + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/metainfo.xml index d487a274b69..0074ad8447f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/metainfo.xml @@ -23,9 +23,18 @@ YARN 2.7.1.2.3 - ECS - MAPREDUCE2 - ZOOKEEPER + + ECS + INSTALL + + + MAPREDUCE2 + INSTALL + + + ZOOKEEPER + INSTALL + @@ -135,7 +144,10 @@ - YARN + + YARN + INSTALL + configuration-mapred diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/metainfo.xml index 1f2c28160a8..41bbd75a310 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/metainfo.xml @@ -41,7 +41,10 @@ - ZOOKEEPER + + ZOOKEEPER + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/FLUME/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/FLUME/metainfo.xml index d554ec7d8c6..0797153eaa6 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/FLUME/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/FLUME/metainfo.xml @@ -42,7 +42,10 @@ - GLUSTERFS + + GLUSTERFS + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HBASE/metainfo.xml index 01758428a16..992c35d1f8b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HBASE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HBASE/metainfo.xml @@ -48,7 +48,10 @@ - ZOOKEEPER + + ZOOKEEPER + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/SLIDER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/SLIDER/metainfo.xml index 09537e2858d..a5b74b38f0a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/SLIDER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/SLIDER/metainfo.xml @@ -47,8 +47,14 @@ - YARN - ZOOKEEPER + + YARN + INSTALL + + + ZOOKEEPER + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/SQOOP/metainfo.xml index 5b02eea3c85..671b48295c8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/SQOOP/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/SQOOP/metainfo.xml @@ -41,7 +41,10 @@ - GLUSTERFS + + GLUSTERFS + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/YARN/metainfo.xml index d185ee861ad..25d64a6578f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/YARN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/YARN/metainfo.xml @@ -52,7 +52,10 @@ - GLUSTERFS + + GLUSTERFS + INSTALL + @@ -88,7 +91,10 @@ configuration-mapred - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml index fb72d98f728..e3e5aaa40ba 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml @@ -133,12 +133,30 @@ - ZOOKEEPER - HDFS - YARN - TEZ - PIG - SLIDER + + ZOOKEEPER + INSTALL + + + HDFS + INSTALL + + + YARN + INSTALL + + + TEZ + INSTALL + + + PIG + INSTALL + + + SLIDER + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml index 66d5a29ca55..305e670ef7e 100644 --- a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metainfo.xml @@ -187,8 +187,14 @@ - FAKEZOOKEEPER - FAKEHDFS + + FAKEZOOKEEPER + INSTALL + + + FAKEHDFS + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHDFS/metainfo.xml index 13b10e01901..8e469bf6e6f 100644 --- a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHDFS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHDFS/metainfo.xml @@ -223,7 +223,10 @@ - FAKEZOOKEEPER + + FAKEZOOKEEPER + INSTALL + diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEYARN/metainfo.xml b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEYARN/metainfo.xml index 240d9bdd9d7..7d42b460fd8 100644 --- a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEYARN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEYARN/metainfo.xml @@ -219,8 +219,14 @@ - FAKEHDFS - FAKEMAPREDUCE2 + + FAKEHDFS + INSTALL + + + FAKEMAPREDUCE2 + INSTALL + @@ -323,7 +329,10 @@ - FAKEYARN + + FAKEYARN + INSTALL + diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java index 4ce3742fc85..43846e0b872 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java @@ -46,6 +46,7 @@ import org.apache.ambari.server.state.CustomCommandDefinition; import org.apache.ambari.server.state.OsSpecific; import org.apache.ambari.server.state.PropertyInfo; +import org.apache.ambari.server.state.RequiredService; import org.apache.ambari.server.state.ServiceInfo; import org.apache.ambari.server.state.ServicePropertyInfo; import org.junit.Test; @@ -141,9 +142,15 @@ public void testResolve_Version() throws Exception { @Test public void testResolve_RequiredServices() throws Exception { - List requiredServices = new ArrayList<>(); - requiredServices.add("foo"); - requiredServices.add("bar"); + List requiredServices = new ArrayList<>(); + //the default scope is INSTALL + RequiredService installService = new RequiredService("foo"); + assertEquals(RequiredService.Scope.INSTALL, installService.getScope()); + + RequiredService runtimeService = new RequiredService("bar", RequiredService.Scope.RUNTIME); + + requiredServices.add(installService); + requiredServices.add(runtimeService); // specified in child only ServiceInfo info = new ServiceInfo(); @@ -162,7 +169,7 @@ public void testResolve_RequiredServices() throws Exception { // specified in both info.setRequiredServices(requiredServices); - parentInfo.setRequiredServices(Collections.singletonList("other")); + parentInfo.setRequiredServices(Collections.singletonList(new RequiredService("other", RequiredService.Scope.INSTALL))); service = resolveService(info, parentInfo); assertEquals(requiredServices, service.getModuleInfo().getRequiredServices()); diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/metainfo.xml index 4f6bbd98709..15a764d62bb 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/metainfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/metainfo.xml @@ -55,7 +55,10 @@ - HDFS + + HDFS + INSTALL + diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml index 4f6bbd98709..15a764d62bb 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml @@ -55,7 +55,10 @@ - HDFS + + HDFS + INSTALL + diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml index acd355689da..e63ac7faf47 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml @@ -118,8 +118,14 @@ 50 - HDFS - TEZ + + HDFS + INSTALL + + + TEZ + INSTALL + global diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/OOZIE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/OOZIE/metainfo.xml index 6010659d882..f6d2759038b 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/OOZIE/metainfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/OOZIE/metainfo.xml @@ -114,7 +114,10 @@ - YARN + + YARN + INSTALL + diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml index aea1252e4af..eae30551bf7 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml @@ -115,7 +115,10 @@ - ZOOKEEPER + + ZOOKEEPER + INSTALL + diff --git a/contrib/management-packs/hdf-ambari-mpack/src/main/resources/common-services/NIFI/1.0.0/metainfo.xml b/contrib/management-packs/hdf-ambari-mpack/src/main/resources/common-services/NIFI/1.0.0/metainfo.xml index ac54975b2d6..04e3160f06b 100644 --- a/contrib/management-packs/hdf-ambari-mpack/src/main/resources/common-services/NIFI/1.0.0/metainfo.xml +++ b/contrib/management-packs/hdf-ambari-mpack/src/main/resources/common-services/NIFI/1.0.0/metainfo.xml @@ -117,7 +117,10 @@ - ZOOKEEPER + + ZOOKEEPER + INSTALL + diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/metainfo.xml b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/metainfo.xml index 9f29864396f..c617b1809c9 100644 --- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/metainfo.xml +++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/metainfo.xml @@ -46,7 +46,10 @@ - YARN + + YARN + INSTALL + diff --git a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/metainfo.xml b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/metainfo.xml index 3fb083be94c..a272aa9ce15 100755 --- a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/metainfo.xml +++ b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/metainfo.xml @@ -351,9 +351,18 @@ 300 - ZOOKEEPER - HDFS - YARN + + ZOOKEEPER + INSTALL + + + HDFS + INSTALL + + + YARN + INSTALL + diff --git a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/YARN/metainfo.xml b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/YARN/metainfo.xml index b374b805f93..39fbd2eddf5 100755 --- a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/YARN/metainfo.xml +++ b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/YARN/metainfo.xml @@ -177,8 +177,14 @@ - HDFS - MAPREDUCE2 + + HDFS + INSTALL + + + MAPREDUCE2 + INSTALL + @@ -287,7 +293,10 @@ - YARN + + YARN + INSTALL + configuration-mapred