Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4BC9E101A6 for ; Tue, 13 Aug 2013 21:17:27 +0000 (UTC) Received: (qmail 50287 invoked by uid 500); 13 Aug 2013 21:17:27 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 50265 invoked by uid 500); 13 Aug 2013 21:17:27 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 50258 invoked by uid 99); 13 Aug 2013 21:17:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Aug 2013 21:17:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DA9C88BE1F1; Tue, 13 Aug 2013 21:17:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swagle@apache.org To: ambari-commits@incubator.apache.org Message-Id: <7d71751f629b4b8cbc3a2453dad3fee8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-2889. yarn user not created on a host with ambari-server and ambari-agent. (Vitaly Brodetskyi via swagle) Date: Tue, 13 Aug 2013 21:17:26 +0000 (UTC) Updated Branches: refs/heads/trunk 72311b797 -> 90395eee0 AMBARI-2889. yarn user not created on a host with ambari-server and ambari-agent. (Vitaly Brodetskyi via swagle) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/90395eee Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/90395eee Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/90395eee Branch: refs/heads/trunk Commit: 90395eee096fd9c9bedd783e2a3f08fa35e49971 Parents: 72311b7 Author: Siddharth Wagle Authored: Tue Aug 13 14:16:49 2013 -0700 Committer: Siddharth Wagle Committed: Tue Aug 13 14:16:49 2013 -0700 ---------------------------------------------------------------------- .../src/main/puppet/modules/hdp-yarn/manifests/init.pp | 8 +------- ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/90395eee/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp index bd9a06a..7b16d8f 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp @@ -21,17 +21,11 @@ class hdp-yarn::initialize() { - $yarn_user = $hdp-yarn::params::yarn_user $mapred_user = $hdp-yarn::params::mapred_user ##Process package hdp-yarn::package{'yarn-common':} - # Create yarn user - hdp::user { 'yarn_user': - user_name => $yarn_user - } - # Create mapred user hdp::user { 'mapred_user': user_name => $mapred_user @@ -40,7 +34,7 @@ class hdp-yarn::initialize() #Generate common configs hdp-yarn::generate_common_configs{'yarn-common-configs':} - anchor{ 'hdp-yarn::initialize::begin': } Hdp::Package['yarn-common'] -> Hdp::User['yarn_user'] -> Hdp-yarn::Generate_common_configs['yarn-common-configs'] -> anchor{ 'hdp-yarn::initialize::end': } + anchor{ 'hdp-yarn::initialize::begin': } Hdp::Package['yarn-common'] -> Hdp-yarn::Generate_common_configs['yarn-common-configs'] -> anchor{ 'hdp-yarn::initialize::end': } } define hdp-yarn::generate_common_configs() { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/90395eee/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp index 26b5fe7..d355bd3 100644 --- a/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp +++ b/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp @@ -195,6 +195,14 @@ class hdp( Anchor['hdp::begin'] -> Hdp::Group['hdp_user_group'] -> Hdp::User['hive_user'] -> Anchor['hdp::end'] } + if ($hdp::params::rm_host != "") { + hdp::user { 'yarn_user': + user_name => $hdp::params::yarn_user + } + + Anchor['hdp::begin'] -> Hdp::Group['hdp_user_group'] -> Hdp::User['yarn_user'] -> Anchor['hdp::end'] + } + } class hdp::pre_install_pkgs