Return-Path: <commits-return-27383-archive-asf-public=cust-asf.ponee.io@ambari.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id CB280200AE3
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed,  4 May 2016 18:05:11 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id C9C551609FC; Wed,  4 May 2016 16:05:11 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 1DE211609A1
	for <archive-asf-public@cust-asf.ponee.io>; Wed,  4 May 2016 18:05:10 +0200 (CEST)
Received: (qmail 26007 invoked by uid 500); 4 May 2016 16:05:10 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 25998 invoked by uid 99); 4 May 2016 16:05:10 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 May 2016 16:05:10 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 3820ADFC7E; Wed,  4 May 2016 16:05:10 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: rnettleton@apache.org
To: commits@ambari.apache.org
Message-Id: <66e656a00a874e6595ac98df75358a5c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ambari git commit: AMBARI-16227. Blueprint deployments with LogSearch
 should fail if Zookeeper is not present. (rnettleton)
Date: Wed,  4 May 2016 16:05:10 +0000 (UTC)
archived-at: Wed, 04 May 2016 16:05:12 -0000

Repository: ambari
Updated Branches:
  refs/heads/trunk 95f5457ab -> f29058895


AMBARI-16227. Blueprint deployments with LogSearch should fail if Zookeeper is not present. (rnettleton)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f2905889
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f2905889
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f2905889

Branch: refs/heads/trunk
Commit: f29058895721873223757555d87ca6fb45bf572c
Parents: 95f5457
Author: Bob Nettleton <rnettleton@hortonworks.com>
Authored: Wed May 4 12:04:34 2016 -0400
Committer: Bob Nettleton <rnettleton@hortonworks.com>
Committed: Wed May 4 12:04:53 2016 -0400

----------------------------------------------------------------------
 .../LOGSEARCH/0.5.0/metainfo.xml                | 31 ++++++++++++++++++++
 1 file changed, 31 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f2905889/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
index 3f96571..b497c67 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
@@ -54,6 +54,15 @@
                 <enabled>true</enabled>
               </auto-deploy>
             </dependency>
+
+            <dependency>
+              <name>ZOOKEEPER/ZOOKEEPER_SERVER</name>
+              <scope>cluster</scope>
+              <auto-deploy>
+                <enabled>true</enabled>
+              </auto-deploy>
+            </dependency>
+
           </dependencies>
           <configuration-dependencies>
             <config-type>logsearch-properties</config-type>
@@ -81,6 +90,15 @@
                 <enabled>true</enabled>
               </auto-deploy>
             </dependency>
+
+            <dependency>
+              <name>ZOOKEEPER/ZOOKEEPER_SERVER</name>
+              <scope>cluster</scope>
+              <auto-deploy>
+                <enabled>true</enabled>
+              </auto-deploy>
+            </dependency>
+
           </dependencies>
           <configuration-dependencies>
             <config-type>logsearch-solr-env</config-type>
@@ -106,6 +124,19 @@
               <primary>true</primary>
             </log>
           </logs>
+
+          <dependencies>
+
+            <dependency>
+              <name>ZOOKEEPER/ZOOKEEPER_SERVER</name>
+              <scope>cluster</scope>
+              <auto-deploy>
+                <enabled>true</enabled>
+              </auto-deploy>
+            </dependency>
+
+          </dependencies>
+
           <configuration-dependencies>
             <config-type>logfeeder-properties</config-type>
             <config-type>logfeeder-env</config-type>