bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ofle...@apache.org
Subject [5/7] bigtop git commit: puppet4: ubuntu-16.04 bigtop/puppet and bigtop/slaves
Date Mon, 24 Apr 2017 20:25:08 GMT
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/88bbd8e6
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/88bbd8e6
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/88bbd8e6

Branch: refs/heads/puppet4
Commit: 88bbd8e65d395e3ea0e048f4fee58a15f30a1c37
Parents: 2f8311b
Author: Olaf Flebbe <of@oflebbe.de>
Authored: Sat Apr 22 18:30:49 2017 +0200
Committer: Olaf Flebbe <of@oflebbe.de>
Committed: Mon Apr 24 22:24:09 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/88bbd8e6/bigtop_toolchain/bin/puppetize.sh
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh
index b0134f0..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-jessie.deb https://apt.puppetlabs.com/puppetlabs-release-jessie.deb
&& dpkg -i /tmp/puppetlabs-release-jessie.deb
-	rm -f /tmp/puppetlabs-release-jessie.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/88bbd8e6/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/88bbd8e6/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


Mime
View raw message