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/8c3c9d47 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8c3c9d47 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8c3c9d47 Branch: refs/heads/puppet4 Commit: 8c3c9d472b48da90a19b14274195445f4c01783f Parents: 88bbd8e Author: Olaf Flebbe <[email protected]> Authored: Sat Apr 22 19:15:50 2017 +0200 Committer: Olaf Flebbe <[email protected]> Committed: Mon Apr 24 22:24:09 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/8c3c9d47/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/8c3c9d47/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/8c3c9d47/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 [email protected] -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/8c3c9d47/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 [email protected] -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
