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/04/22 17:46:25 UTC
bigtop git commit: puppet4: different paths
Repository: bigtop
Updated Branches:
refs/heads/puppet4 56f081725 -> aa23b6cee
puppet4: different paths
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/aa23b6ce
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/aa23b6ce
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/aa23b6ce
Branch: refs/heads/puppet4
Commit: aa23b6cee8e65a217817144185d55f2743c9b96b
Parents: 56f0817
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sat Apr 22 19:45:44 2017 +0200
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sat Apr 22 19:45:44 2017 +0200
----------------------------------------------------------------------
provisioner/docker/docker-compose.yml | 2 +-
provisioner/docker/docker-hadoop.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/aa23b6ce/provisioner/docker/docker-compose.yml
----------------------------------------------------------------------
diff --git a/provisioner/docker/docker-compose.yml b/provisioner/docker/docker-compose.yml
index cee849e..a20b2c5 100644
--- a/provisioner/docker/docker-compose.yml
+++ b/provisioner/docker/docker-compose.yml
@@ -21,6 +21,6 @@ bigtop:
mem_limit: ${MEM_LIMIT}
volumes:
- ../../:/bigtop-home
- - ./config/hiera.yaml:/etc/puppet/hiera.yaml
+ - ./config/hiera.yaml:/etc/puppetlabs/puppet/hiera.yaml
- ./config/hieradata:/etc/puppet/hieradata
- ./config/hosts:/etc/hosts
http://git-wip-us.apache.org/repos/asf/bigtop/blob/aa23b6ce/provisioner/docker/docker-hadoop.sh
----------------------------------------------------------------------
diff --git a/provisioner/docker/docker-hadoop.sh b/provisioner/docker/docker-hadoop.sh
index 12488a1..7921721 100755
--- a/provisioner/docker/docker-hadoop.sh
+++ b/provisioner/docker/docker-hadoop.sh
@@ -132,7 +132,7 @@ 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'
+ docker exec $1 bash -c '/opt/puppetlabs/puppet/bin/puppet apply --modulepath=/bigtop-home/bigtop-deploy/puppet/modules:/etc/puppetlabs/code/environments/production/modules /bigtop-home/bigtop-deploy/puppet/manifests'
}
get-yaml-config() {