Return-Path: 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 18FDE200C6D for ; Sat, 22 Apr 2017 20:05:48 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 16FAD160B91; Sat, 22 Apr 2017 18:05:48 +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 5C899160BA2 for ; Sat, 22 Apr 2017 20:05:47 +0200 (CEST) Received: (qmail 55210 invoked by uid 500); 22 Apr 2017 18:05:46 -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 55144 invoked by uid 99); 22 Apr 2017 18:05:46 -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; Sat, 22 Apr 2017 18:05:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5FC9EE1835; Sat, 22 Apr 2017 18:05:46 +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 Date: Sat, 22 Apr 2017 18:05:47 -0000 Message-Id: In-Reply-To: <4c651ae0d8a94b53a08dc6d8288eae5e@git.apache.org> References: <4c651ae0d8a94b53a08dc6d8288eae5e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] bigtop git commit: BIGTOP-2750: puppet: increase compatibility with future versions archived-at: Sat, 22 Apr 2017 18:05:48 -0000 BIGTOP-2750: puppet: increase compatibility with future versions Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/6abbbfc4 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6abbbfc4 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6abbbfc4 Branch: refs/heads/puppet4 Commit: 6abbbfc46dec85bffcf8136bc0712bbd135ae2b6 Parents: 14e7f39 Author: Olaf Flebbe Authored: Sat Apr 22 19:44:30 2017 +0200 Committer: Olaf Flebbe Committed: Sat Apr 22 19:56:59 2017 +0200 ---------------------------------------------------------------------- bigtop-deploy/puppet/manifests/cluster.pp | 2 +- bigtop-deploy/puppet/manifests/site.pp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/6abbbfc4/bigtop-deploy/puppet/manifests/cluster.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/manifests/cluster.pp b/bigtop-deploy/puppet/manifests/cluster.pp index 83bb7b2..e4e22b2 100644 --- a/bigtop-deploy/puppet/manifests/cluster.pp +++ b/bigtop-deploy/puppet/manifests/cluster.pp @@ -223,7 +223,7 @@ class node_with_roles ($roles = hiera("bigtop::roles")) inherits hadoop_cluster_ "ambari", ] - deploy_module { $modules: + node_with_roles::deploy_module { $modules: roles => $roles, } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/6abbbfc4/bigtop-deploy/puppet/manifests/site.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/manifests/site.pp b/bigtop-deploy/puppet/manifests/site.pp index f35a4e0..bf0212c 100644 --- a/bigtop-deploy/puppet/manifests/site.pp +++ b/bigtop-deploy/puppet/manifests/site.pp @@ -21,6 +21,8 @@ case $operatingsystem { } # Detect env to pick up default repo for other Bigtop supported OSs default: { + include stdlib + $lower_os = downcase($operatingsystem) # We use code name such as trusty for Ubuntu instead of release version in bigtop's binary convenience repos if ($operatingsystem == "Ubuntu") { $release = $lsbdistcodename } else { $release = $operatingsystemmajrelease }