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 18:05:46 UTC
[1/2] bigtop git commit: puppet4: different paths [Forced Update!]
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() {
[2/2] bigtop git commit: BIGTOP-2750: puppet: increase compatibility
with future versions
Posted by of...@apache.org.
BIGTOP-2750: puppet: increase compatibility with future versions
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/6abbbfc4
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6abbbfc4
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6abbbfc4
Branch: refs/heads/puppet4
Commit: 6abbbfc46dec85bffcf8136bc0712bbd135ae2b6
Parents: 14e7f39
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sat Apr 22 19:44:30 2017 +0200
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sat Apr 22 19:56:59 2017 +0200
----------------------------------------------------------------------
bigtop-deploy/puppet/manifests/cluster.pp | 2 +-
bigtop-deploy/puppet/manifests/site.pp | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6abbbfc4/bigtop-deploy/puppet/manifests/cluster.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/manifests/cluster.pp b/bigtop-deploy/puppet/manifests/cluster.pp
index 83bb7b2..e4e22b2 100644
--- a/bigtop-deploy/puppet/manifests/cluster.pp
+++ b/bigtop-deploy/puppet/manifests/cluster.pp
@@ -223,7 +223,7 @@ class node_with_roles ($roles = hiera("bigtop::roles")) inherits hadoop_cluster_
"ambari",
]
- deploy_module { $modules:
+ node_with_roles::deploy_module { $modules:
roles => $roles,
}
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6abbbfc4/bigtop-deploy/puppet/manifests/site.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/manifests/site.pp b/bigtop-deploy/puppet/manifests/site.pp
index f35a4e0..bf0212c 100644
--- a/bigtop-deploy/puppet/manifests/site.pp
+++ b/bigtop-deploy/puppet/manifests/site.pp
@@ -21,6 +21,8 @@ case $operatingsystem {
}
# Detect env to pick up default repo for other Bigtop supported OSs
default: {
+ include stdlib
+
$lower_os = downcase($operatingsystem)
# We use code name such as trusty for Ubuntu instead of release version in bigtop's binary convenience repos
if ($operatingsystem == "Ubuntu") { $release = $lsbdistcodename } else { $release = $operatingsystemmajrelease }