bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From evan...@apache.org
Subject bigtop git commit: BIGTOP-1879. vagrant-puppet-vm is broken
Date Fri, 22 May 2015 17:17:52 GMT
Repository: bigtop
Updated Branches:
  refs/heads/master d39068630 -> 46d0a7239


BIGTOP-1879. vagrant-puppet-vm is broken

Signed-off-by: Evans Ye <evansye@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/46d0a723
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/46d0a723
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/46d0a723

Branch: refs/heads/master
Commit: 46d0a72399c12cca98e9bac7e354e5cb18ec78be
Parents: d390686
Author: YoungWoo Kim <ywkim@apache.org>
Authored: Thu May 21 15:47:58 2015 +0900
Committer: Evans Ye <evansye@apache.org>
Committed: Fri May 22 17:17:26 2015 +0000

----------------------------------------------------------------------
 bigtop-deploy/vm/utils/setup-env-centos.sh          | 5 +++++
 bigtop-deploy/vm/utils/setup-env-debian.sh          | 5 +++++
 bigtop-deploy/vm/vagrant-puppet-docker/provision.sh | 5 -----
 3 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/46d0a723/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 58cdd34..d398a38 100755
--- a/bigtop-deploy/vm/utils/setup-env-centos.sh
+++ b/bigtop-deploy/vm/utils/setup-env-centos.sh
@@ -36,3 +36,8 @@ if [ $enable_local_repo == "true" ]; then
 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/46d0a723/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 40fc0ea..aa173b9 100755
--- a/bigtop-deploy/vm/utils/setup-env-debian.sh
+++ b/bigtop-deploy/vm/utils/setup-env-debian.sh
@@ -33,3 +33,8 @@ if [ $enable_local_repo == "true" ]; then
 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/46d0a723/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh b/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh
index 3fa9cac..6e40c69 100755
--- a/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh
@@ -23,11 +23,6 @@ umount /etc/hosts
 mv /etc/hosts /etc/hosts.bak
 ln -s /vagrant/hosts /etc/hosts
 
-# Install puppet modules
-puppet apply --modulepath=/bigtop-home -e "include bigtop_toolchain::puppet-modules"
-
-mkdir -p /data/{1,2}
-
 # Prepare puppet configuration file
 mkdir -p /etc/puppet/hieradata
 cp /bigtop-home/bigtop-deploy/puppet/hiera.yaml /etc/puppet


Mime
View raw message