From commits-return-3667-apmail-bigtop-commits-archive=bigtop.apache.org@bigtop.apache.org Mon Apr 24 20:25:05 2017 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 58A861811C for ; Mon, 24 Apr 2017 20:25:05 +0000 (UTC) Received: (qmail 73328 invoked by uid 500); 24 Apr 2017 20:25:05 -0000 Delivered-To: apmail-bigtop-commits-archive@bigtop.apache.org Received: (qmail 73219 invoked by uid 500); 24 Apr 2017 20:25:05 -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 73058 invoked by uid 99); 24 Apr 2017 20:25:04 -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; Mon, 24 Apr 2017 20:25:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C4C5E152F; Mon, 24 Apr 2017 20:25:04 +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: Mon, 24 Apr 2017 20:25:09 -0000 Message-Id: <2796ebc8f5344de293613d6dd52b2a37@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/7] bigtop git commit: puppet4: different paths puppet4: different paths Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/0cc34730 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/0cc34730 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/0cc34730 Branch: refs/heads/puppet4 Commit: 0cc34730d7e5b8323f538aeeb1fd2f4725a19c17 Parents: 8c3c9d4 Author: Olaf Flebbe Authored: Sat Apr 22 19:45:44 2017 +0200 Committer: Olaf Flebbe Committed: Mon Apr 24 22:24:09 2017 +0200 ---------------------------------------------------------------------- provisioner/docker/docker-compose.yml | 2 +- provisioner/docker/docker-hadoop.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/0cc34730/provisioner/docker/docker-compose.yml ---------------------------------------------------------------------- diff --git a/provisioner/docker/docker-compose.yml b/provisioner/docker/docker-compose.yml index cee849e..a20b2c5 100644 --- a/provisioner/docker/docker-compose.yml +++ b/provisioner/docker/docker-compose.yml @@ -21,6 +21,6 @@ bigtop: mem_limit: ${MEM_LIMIT} volumes: - ../../:/bigtop-home - - ./config/hiera.yaml:/etc/puppet/hiera.yaml + - ./config/hiera.yaml:/etc/puppetlabs/puppet/hiera.yaml - ./config/hieradata:/etc/puppet/hieradata - ./config/hosts:/etc/hosts http://git-wip-us.apache.org/repos/asf/bigtop/blob/0cc34730/provisioner/docker/docker-hadoop.sh ---------------------------------------------------------------------- diff --git a/provisioner/docker/docker-hadoop.sh b/provisioner/docker/docker-hadoop.sh index 12488a1..7921721 100755 --- a/provisioner/docker/docker-hadoop.sh +++ b/provisioner/docker/docker-hadoop.sh @@ -132,7 +132,7 @@ destroy() { } bigtop-puppet() { - docker exec $1 bash -c 'puppet apply --parser future --modulepath=/bigtop-home/bigtop-deploy/puppet/modules:/etc/puppet/modules /bigtop-home/bigtop-deploy/puppet/manifests' + docker exec $1 bash -c '/opt/puppetlabs/puppet/bin/puppet apply --modulepath=/bigtop-home/bigtop-deploy/puppet/modules:/etc/puppetlabs/code/environments/production/modules /bigtop-home/bigtop-deploy/puppet/manifests' } get-yaml-config() {