diff options
| author | YoungWoo Kim <ywkim@apache.org> | 2015-05-21 15:47:58 +0900 |
|---|---|---|
| committer | Evans Ye <evansye@apache.org> | 2015-05-22 17:17:26 +0000 |
| commit | 46d0a72399c12cca98e9bac7e354e5cb18ec78be (patch) | |
| tree | 7884e12db9d29f1b13ccc922a5e38122b4cc8b43 /bigtop-deploy | |
| parent | d390686305c10783cb8576b2fb82b229716abb9a (diff) | |
BIGTOP-1879. vagrant-puppet-vm is broken
Signed-off-by: Evans Ye <evansye@apache.org>
Diffstat (limited to 'bigtop-deploy')
| -rwxr-xr-x | bigtop-deploy/vm/utils/setup-env-centos.sh | 5 | ||||
| -rwxr-xr-x | bigtop-deploy/vm/utils/setup-env-debian.sh | 5 | ||||
| -rwxr-xr-x | bigtop-deploy/vm/vagrant-puppet-docker/provision.sh | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/bigtop-deploy/vm/utils/setup-env-centos.sh b/bigtop-deploy/vm/utils/setup-env-centos.sh index 58cdd34d..d398a387 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} diff --git a/bigtop-deploy/vm/utils/setup-env-debian.sh b/bigtop-deploy/vm/utils/setup-env-debian.sh index 40fc0ea5..aa173b9c 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} diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh b/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh index 3fa9cac7..6e40c690 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 |