You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2017/11/22 17:07:02 UTC
bigtop git commit: BIGTOP-2935: provisioner: Use proper command line
depending on puppet version
Repository: bigtop
Updated Branches:
refs/heads/master 7567b884c -> a8f8a0631
BIGTOP-2935: provisioner: Use proper command line depending on puppet version
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/a8f8a063
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/a8f8a063
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/a8f8a063
Branch: refs/heads/master
Commit: a8f8a063101cb2ec1e6e7ed3e1af4253b9b2b64b
Parents: 7567b88
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sun Nov 19 22:58:45 2017 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Wed Nov 22 18:02:52 2017 +0100
----------------------------------------------------------------------
docker/sandbox/startup.sh | 5 ++++-
provisioner/docker/docker-hadoop.sh | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/a8f8a063/docker/sandbox/startup.sh
----------------------------------------------------------------------
diff --git a/docker/sandbox/startup.sh b/docker/sandbox/startup.sh
index ff38894..e183a48 100755
--- a/docker/sandbox/startup.sh
+++ b/docker/sandbox/startup.sh
@@ -19,7 +19,10 @@ init() {
echo "`facter ipaddress` `facter fqdn`" >> /etc/hosts
cp /etc/puppet/hieradata/site.yaml.template /etc/puppet/hieradata/site.yaml
sed -i -e "s/head.node.fqdn/`facter fqdn`/g" /etc/puppet/hieradata/site.yaml
- puppet apply --parser future --modulepath=/bigtop-puppet/modules:/etc/puppet/modules /bigtop-puppet/manifests
+ if puppet --version | grep ^3 >/dev/null ; then
+ future="--parser future"
+ fi
+ puppet apply $future --modulepath=/bigtop-puppet/modules:/etc/puppet/modules:/usr/share/puppet/modules /bigtop-puppet/manifests
}
usage() {
http://git-wip-us.apache.org/repos/asf/bigtop/blob/a8f8a063/provisioner/docker/docker-hadoop.sh
----------------------------------------------------------------------
diff --git a/provisioner/docker/docker-hadoop.sh b/provisioner/docker/docker-hadoop.sh
index 2783a1f..203fc44 100755
--- a/provisioner/docker/docker-hadoop.sh
+++ b/provisioner/docker/docker-hadoop.sh
@@ -129,7 +129,10 @@ 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'
+ if docker exec $1 bash -c "puppet --version" | grep ^3 >/dev/null ; then
+ future="--parser future"
+ fi
+ docker exec $1 bash -c "puppet apply $future --modulepath=/bigtop-home/bigtop-deploy/puppet/modules:/etc/puppet/modules:/usr/share/puppet/modules /bigtop-home/bigtop-deploy/puppet/manifests"
}
get-yaml-config() {