bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ofle...@apache.org
Subject [1/2] bigtop git commit: puppet4: different paths [Forced Update!]
Date Sat, 22 Apr 2017 18:05:46 GMT
Repository: bigtop
Updated Branches:
  refs/heads/puppet4 aa23b6cee -> 6abbbfc46 (forced update)


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/14e7f39c
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/14e7f39c
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/14e7f39c

Branch: refs/heads/puppet4
Commit: 14e7f39c1306d59f8912bf27b469970fc933156f
Parents: d7e2d3a
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:53:52 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/14e7f39c/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/14e7f39c/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() {


Mime
View raw message