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 EFA3018EE1 for ; Sun, 25 Oct 2015 19:07:14 +0000 (UTC) Received: (qmail 69293 invoked by uid 500); 25 Oct 2015 19:07:14 -0000 Delivered-To: apmail-bigtop-commits-archive@bigtop.apache.org Received: (qmail 69256 invoked by uid 500); 25 Oct 2015 19:07: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 69247 invoked by uid 99); 25 Oct 2015 19:07:14 -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; Sun, 25 Oct 2015 19:07:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7774FDFF1B; Sun, 25 Oct 2015 19:07:14 +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: <97a02fc7c8524b6ea316fc048d1d312a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: bigtop git commit: BIGTOP-2098: Update bigtop_deploy to current state of puppetize.sh Date: Sun, 25 Oct 2015 19:07:14 +0000 (UTC) Repository: bigtop Updated Branches: refs/heads/master 564e7c308 -> f91e1c1e3 BIGTOP-2098: Update bigtop_deploy to current state of puppetize.sh Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/f91e1c1e Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/f91e1c1e Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/f91e1c1e Branch: refs/heads/master Commit: f91e1c1e343b2f9d917b564f97a1e86445cc72f6 Parents: 564e7c3 Author: Olaf Flebbe Authored: Sun Oct 25 19:27:58 2015 +0100 Committer: Olaf Flebbe Committed: Sun Oct 25 19:27:58 2015 +0100 ---------------------------------------------------------------------- bigtop-deploy/vm/utils/setup-env-centos.sh | 8 +------- bigtop-deploy/vm/utils/setup-env-debian.sh | 16 +--------------- .../vm/vagrant-puppet-docker/docker-hadoop.sh | 2 +- 3 files changed, 3 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/f91e1c1e/bigtop-deploy/vm/utils/setup-env-centos.sh ---------------------------------------------------------------------- diff --git a/bigtop-deploy/vm/utils/setup-env-centos.sh b/bigtop-deploy/vm/utils/setup-env-centos.sh index d398a38..2439d63 100755 --- a/bigtop-deploy/vm/utils/setup-env-centos.sh +++ b/bigtop-deploy/vm/utils/setup-env-centos.sh @@ -16,11 +16,8 @@ # limitations under the License. enable_local_repo=${1:-false} -echo "$enable_local_repo" -# Install puppet agent -yum -y install http://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm -yum -y install puppet curl sudo unzip +bash /bigtop-home/bigtop_toolchain/bin/puppetize.sh # Setup rng-tools to improve virtual machine entropy performance. # The poor entropy performance will cause kerberos provisioning failed. @@ -37,7 +34,4 @@ else echo "local yum = $enable_local_repo ; NOT Enabling local yum. Packages will be pulled from remote..." fi -# Install puppet modules -puppet apply --modulepath=/bigtop-home -e "include bigtop_toolchain::puppet-modules" - mkdir -p /data/{1,2} http://git-wip-us.apache.org/repos/asf/bigtop/blob/f91e1c1e/bigtop-deploy/vm/utils/setup-env-debian.sh ---------------------------------------------------------------------- diff --git a/bigtop-deploy/vm/utils/setup-env-debian.sh b/bigtop-deploy/vm/utils/setup-env-debian.sh index 46bdc87..e905754 100755 --- a/bigtop-deploy/vm/utils/setup-env-debian.sh +++ b/bigtop-deploy/vm/utils/setup-env-debian.sh @@ -17,18 +17,7 @@ enable_local_repo=${1:-false} -# BIGTOP-2003. A workaround to install newer hiera to get rid of hiera 1.3.0 bug. -# This hack should be removed when newer hiera is available natively in Ubuntu. -cat /etc/*release |grep Ubuntu >/dev/null -if [ $? == 0 ]; then - wget https://apt.puppetlabs.com/puppetlabs-release-trusty.deb - sudo dpkg -i puppetlabs-release-trusty.deb - sudo apt-get update -fi - -# Install puppet agent -apt-get update -apt-get -y install puppet curl sudo unzip +bash /bigtop-home/bigtop_toolchain/bin/puppetize.sh # Setup rng-tools to improve virtual machine entropy performance. # The poor entropy performance will cause kerberos provisioning failed. @@ -43,7 +32,4 @@ else echo "local yum = $enable_local_repo ; NOT Enabling local yum. Packages will be pulled from remote..." fi -# Install puppet modules -puppet apply --modulepath=/bigtop-home -e "include bigtop_toolchain::puppet-modules" - mkdir -p /data/{1,2} http://git-wip-us.apache.org/repos/asf/bigtop/blob/f91e1c1e/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh ---------------------------------------------------------------------- diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh b/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh index 9e30521..4b7a6b9 100755 --- a/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh +++ b/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh @@ -81,7 +81,7 @@ destroy() { } bigtop-puppet() { - echo "puppet apply -d --modulepath=/bigtop-home/bigtop-deploy/puppet/modules:/etc/puppet/modules:/usr/share/puppet/modules /bigtop-home/bigtop-deploy/puppet/manifests/site.pp" |vagrant ssh $1 + echo "puppet apply -d --modulepath=/bigtop-home/bigtop-deploy/puppet/modules:/etc/puppet/modules /bigtop-home/bigtop-deploy/puppet/manifests/site.pp" |vagrant ssh $1 } get-yaml-config() {