bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ofle...@apache.org
Subject bigtop git commit: BIGTOP-2098: Update bigtop_deploy to current state of puppetize.sh
Date Sun, 25 Oct 2015 19:07:14 GMT
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 <of@oflebbe.de>
Authored: Sun Oct 25 19:27:58 2015 +0100
Committer: Olaf Flebbe <of@oflebbe.de>
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() {


Mime
View raw message