From commits-return-2418-apmail-bigtop-commits-archive=bigtop.apache.org@bigtop.apache.org Fri May 1 20:57:14 2015 Return-Path: X-Original-To: apmail-bigtop-commits-archive@www.apache.org Delivered-To: apmail-bigtop-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 17E6117574 for ; Fri, 1 May 2015 20:57:14 +0000 (UTC) Received: (qmail 39559 invoked by uid 500); 1 May 2015 20:57:14 -0000 Delivered-To: apmail-bigtop-commits-archive@bigtop.apache.org Received: (qmail 39522 invoked by uid 500); 1 May 2015 20:57:14 -0000 Mailing-List: contact commits-help@bigtop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@bigtop.apache.org Delivered-To: mailing list commits@bigtop.apache.org Received: (qmail 39511 invoked by uid 99); 1 May 2015 20:57:13 -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; Fri, 01 May 2015 20:57:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D941EE179E; Fri, 1 May 2015 20:57:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: oflebbe@apache.org To: commits@bigtop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: bigtop git commit: BIGTOP-1857: Support yarn-built-in proxy Date: Fri, 1 May 2015 20:57:13 +0000 (UTC) Repository: bigtop Updated Branches: refs/heads/master 63a857464 -> 66facb918 BIGTOP-1857: Support yarn-built-in proxy Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/66facb91 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/66facb91 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/66facb91 Branch: refs/heads/master Commit: 66facb9187afd3f4cb3f6633274d3e3a64556da6 Parents: 63a8574 Author: Olaf Flebbe Authored: Thu Apr 30 15:15:39 2015 +0200 Committer: Olaf Flebbe Committed: Fri May 1 22:56:29 2015 +0200 ---------------------------------------------------------------------- bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/66facb91/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml b/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml index 27bc566..6f6c464 100644 --- a/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml +++ b/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml @@ -57,10 +57,12 @@ <% end %> +<% if @hadoop_ps_host %> yarn.web-proxy.address <%= @hadoop_ps_host %>:<%= @hadoop_ps_port %> +<% end %> <% if @yarn_resourcemanager_ha_enabled -%>