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:16:08 UTC
bigtop git commit: puppet4: make centos-6 and centos-7 work
Repository: bigtop
Updated Branches:
refs/heads/puppet4 bf0fbbdb3 -> d7e2d3ae7
puppet4: make centos-6 and centos-7 work
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/d7e2d3ae
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/d7e2d3ae
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/d7e2d3ae
Branch: refs/heads/puppet4
Commit: d7e2d3ae7e625221639a0d628e7efbb711909fe2
Parents: bf0fbbd
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sat Apr 22 19:15:50 2017 +0200
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sat Apr 22 19:15:50 2017 +0200
----------------------------------------------------------------------
bigtop_toolchain/bin/puppetize.sh | 4 ++--
bigtop_toolchain/manifests/packages.pp | 2 +-
docker/bigtop-slaves/centos-6/Dockerfile | 4 ++--
docker/bigtop-slaves/centos-7/Dockerfile | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/d7e2d3ae/bigtop_toolchain/bin/puppetize.sh
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh
index a85133a..098af70 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -65,11 +65,11 @@ case ${ID}-${VERSION_ID} in
zypper --gpg-auto-import-keys install -y curl sudo unzip wget puppet suse-release ca-certificates-mozilla net-tools tar
;;
centos-6*)
- rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm
+ rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm
yum -y install curl sudo unzip wget puppet tar
;;
centos-7*)
- rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm
+ rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm
yum -y install hostname curl sudo unzip wget puppet
;;
*)
http://git-wip-us.apache.org/repos/asf/bigtop/blob/d7e2d3ae/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index d89fa4b..a8f464a 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -17,7 +17,7 @@ class bigtop_toolchain::packages {
case $operatingsystem{
/(?i:(centos|fedora))/: {
# Fedora 20 and CentOS 7 or above are using mariadb, while CentOS 6 is still mysql
- if ($operatingsystem == "CentOS") and ($operatingsystemmajrelease <=6) {
+ if ($operatingsystem == "CentOS") and ($operatingsystemmajrelease <= "6" ) {
$mysql_devel="mysql-devel"
} else {
$mysql_devel="mariadb-devel"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/d7e2d3ae/docker/bigtop-slaves/centos-6/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/centos-6/Dockerfile b/docker/bigtop-slaves/centos-6/Dockerfile
index a5a3b69..47c7e95 100644
--- a/docker/bigtop-slaves/centos-6/Dockerfile
+++ b/docker/bigtop-slaves/centos-6/Dockerfile
@@ -15,8 +15,8 @@
FROM bigtop/puppet:centos-6
MAINTAINER oflebbe@apache.org
-COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
+COPY bigtop_toolchain /opt/puppetlabs/puppet/modules/bigtop_toolchain
-RUN puppet apply -e "include bigtop_toolchain::installer"
+RUN /opt/puppetlabs/puppet/bin/puppet apply -e "include bigtop_toolchain::installer"
COPY . /tmp/bigtop
RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop
http://git-wip-us.apache.org/repos/asf/bigtop/blob/d7e2d3ae/docker/bigtop-slaves/centos-7/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/centos-7/Dockerfile b/docker/bigtop-slaves/centos-7/Dockerfile
index 5425175..8dbe559 100644
--- a/docker/bigtop-slaves/centos-7/Dockerfile
+++ b/docker/bigtop-slaves/centos-7/Dockerfile
@@ -15,8 +15,8 @@
FROM bigtop/puppet:centos-7
MAINTAINER oflebbe@apache.org
-COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
+COPY bigtop_toolchain /opt/puppetlabs/puppet/modules/bigtop_toolchain
-RUN puppet apply -e "include bigtop_toolchain::installer"
+RUN /opt/puppetlabs/puppet/bin/puppet apply -e "include bigtop_toolchain::installer"
COPY . /tmp/bigtop
RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop