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 16:32:28 UTC
[1/2] bigtop git commit: BIGTOP-2748: Fix a puppet compatibilty issue
Repository: bigtop
Updated Branches:
refs/heads/puppet4 [created] bf0fbbdb3
BIGTOP-2748: Fix a puppet compatibilty issue
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/3856ddd6
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/3856ddd6
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/3856ddd6
Branch: refs/heads/puppet4
Commit: 3856ddd6d3fa2288bf1ea6438ccec9c247e9267e
Parents: 905bfe4
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sat Apr 22 18:27:43 2017 +0200
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sat Apr 22 18:27:43 2017 +0200
----------------------------------------------------------------------
bigtop_toolchain/manifests/packages.pp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/3856ddd6/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index 64bc12b..d89fa4b 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -132,7 +132,7 @@ class bigtop_toolchain::packages {
require => [Package['libapr1']]
}
}
- Amazon: { $pkgs = [
+ /Amazon/: { $pkgs = [
"unzip",
"curl",
"wget",
[2/2] bigtop git commit: puppet4: ubuntu-16.04 bigtop/puppet and
bigtop/slaves
Posted by of...@apache.org.
puppet4: ubuntu-16.04 bigtop/puppet and bigtop/slaves
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/bf0fbbdb
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/bf0fbbdb
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/bf0fbbdb
Branch: refs/heads/puppet4
Commit: bf0fbbdb3757e16cf95d4718909d7b150eb3cec8
Parents: 3856ddd
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sat Apr 22 18:30:49 2017 +0200
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sat Apr 22 18:30:49 2017 +0200
----------------------------------------------------------------------
bigtop_toolchain/bin/puppetize.sh | 33 ++++++++++++-----------
build.gradle | 2 +-
docker/bigtop-slaves/ubuntu-16.04/Dockerfile | 4 +--
3 files changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/bf0fbbdb/bigtop_toolchain/bin/puppetize.sh
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh
index a9d7798..a85133a 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -39,26 +39,27 @@ case ${ID}-${VERSION_ID} in
ubuntu-14.04)
apt-get update
apt-get -y install wget
- if [ $HOSTTYPE = "x86_64" ] ; then
- # BIGTOP-2003. A workaround to install newer hiera to get rid of hiera 1.3.0 bug.
- wget -O /tmp/puppetlabs-release-trusty.deb https://apt.puppetlabs.com/puppetlabs-release-trusty.deb && dpkg -i /tmp/puppetlabs-release-trusty.deb
- rm -f /tmp/puppetlabs-release-trusty.deb
- apt-get update
- fi
- apt-get -y install curl sudo unzip puppet software-properties-common
- ;;
- ubuntu-*)
+ wget -O /tmp/puppetlabs-release-pc1-trusty.deb https://apt.puppetlabs.com/puppetlabs-release-pc1-trusty.deb && dpkg -i /tmp/puppetlabs-release-trusty-pc1.deb
+ rm -f /tmp/puppetlabs-release-trusty.deb
apt-get update
- apt-get -y install curl sudo unzip wget puppet software-properties-common
+ apt-get -y install curl sudo unzip puppet software-properties-common
;;
+ ubuntu-16.04)
+ apt-get update
+ apt-get -y install wget
+ wget -O /tmp/puppetlabs-release-pc1-xenial.deb https://apt.puppetlabs.com/puppetlabs-release-pc1-xenial.deb
+ dpkg -i /tmp/puppetlabs-release-pc1-xenial.deb
+ rm -f /tmp/puppetlabs-release-pc1-xenial.deb
+ apt-get update
+ apt-get -y install curl sudo unzip puppet-agent software-properties-common
+ ;;
debian-8*)
apt-get update
apt-get -y install wget
- # BIGTOP-2523. in order to install puppet 3.8 we need to get it from puppet repo
- wget -O /tmp/puppetlabs-release-trusty.deb https://apt.puppetlabs.com/puppetlabs-release-trusty.deb && dpkg -i /tmp/puppetlabs-release-trusty.deb
- rm -f /tmp/puppetlabs-release-trusty.deb
+ wget -O /tmp/puppetlabs-release-pc1-jessie.deb https://apt.puppetlabs.com/puppetlabs-release-pc1-jessie.deb && dpkg -i /tmp/puppetlabs-release-pc1-jessie.deb
+ rm -f /tmp/puppetlabs-release-pc1-jessie.deb
apt-get update
- apt-get -y install curl sudo unzip puppet
+ apt-get -y install curl sudo unzip puppet-agent
;;
opensuse-*)
zypper --gpg-auto-import-keys install -y curl sudo unzip wget puppet suse-release ca-certificates-mozilla net-tools tar
@@ -76,9 +77,9 @@ case ${ID}-${VERSION_ID} in
exit 1
esac
-puppet module install puppetlabs-stdlib
+/opt/puppetlabs/bin/puppet module install puppetlabs-stdlib
case ${ID} in
debian|ubuntu)
- puppet module install puppetlabs-apt;;
+ /opt/puppetlabs/bin/puppet module install puppetlabs-apt;;
esac
http://git-wip-us.apache.org/repos/asf/bigtop/blob/bf0fbbdb/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index f9d4a69..c1e315b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -420,7 +420,7 @@ task "bigtop-slaves"(type:Exec,
'docker', 'build',
'-t', 'bigtop/slaves:' + _prefix + '-' + _OS,
'-f', "docker/bigtop-slaves/" + _OS + "/Dockerfile",
- '--force-rm', '--no-cache', '--pull', '--rm',
+ '--rm',
'.'
]
workingDir '.'
http://git-wip-us.apache.org/repos/asf/bigtop/blob/bf0fbbdb/docker/bigtop-slaves/ubuntu-16.04/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/ubuntu-16.04/Dockerfile b/docker/bigtop-slaves/ubuntu-16.04/Dockerfile
index 74abcc5..bcc82ee 100644
--- a/docker/bigtop-slaves/ubuntu-16.04/Dockerfile
+++ b/docker/bigtop-slaves/ubuntu-16.04/Dockerfile
@@ -15,8 +15,8 @@
FROM bigtop/puppet:ubuntu-16.04
MAINTAINER Amir Sanjar
-COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
+COPY bigtop_toolchain /opt/puppetlabs/puppet/modules/bigtop_toolchain
-RUN apt-get clean && apt-get update && puppet apply -e "include bigtop_toolchain::installer"
+RUN apt-get clean && apt-get update && /opt/puppetlabs/bin/puppet apply -e "include bigtop_toolchain::installer"
COPY . /tmp/bigtop
RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop