Repository: bigtop Updated Branches: refs/heads/master 8048c8e96 -> f436309e1
BIGTOP-2086: Install essential puppet modules along with puppet itself Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/f436309e Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/f436309e Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/f436309e Branch: refs/heads/master Commit: f436309e1d3b7553433b75da46986a0cd4cdcf90 Parents: 8048c8e Author: Olaf Flebbe <[email protected]> Authored: Fri Oct 9 20:49:58 2015 +0200 Committer: Olaf Flebbe <[email protected]> Committed: Sat Oct 10 16:11:23 2015 +0200 ---------------------------------------------------------------------- bigtop_toolchain/bin/puppetize.sh | 7 +++++++ docker/bigtop-slaves/centos-6/Dockerfile | 3 +-- docker/bigtop-slaves/centos-7/Dockerfile | 3 +-- docker/bigtop-slaves/debian-8/Dockerfile | 3 +-- docker/bigtop-slaves/fedora-20/Dockerfile | 3 +-- docker/bigtop-slaves/opensuse-13.2/Dockerfile | 3 +-- docker/bigtop-slaves/ubuntu-14.04/Dockerfile | 3 +-- 7 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/f436309e/bigtop_toolchain/bin/puppetize.sh ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh index 84681f9..6facf14 100755 --- a/bigtop_toolchain/bin/puppetize.sh +++ b/bigtop_toolchain/bin/puppetize.sh @@ -69,3 +69,10 @@ case ${ID}-${VERSION_ID} in echo "Unsupported OS ${ID}-${VERSION_ID}." exit 1 esac + +puppet module install puppetlabs-stdlib + +case ${ID} in + debian|ubuntu) + puppet module install puppetlabs-apt;; +esac http://git-wip-us.apache.org/repos/asf/bigtop/blob/f436309e/docker/bigtop-slaves/centos-6/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/centos-6/Dockerfile b/docker/bigtop-slaves/centos-6/Dockerfile index e5dba07..90dc7fb 100644 --- a/docker/bigtop-slaves/centos-6/Dockerfile +++ b/docker/bigtop-slaves/centos-6/Dockerfile @@ -17,5 +17,4 @@ MAINTAINER [email protected] COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain -RUN puppet apply -e "include bigtop_toolchain::puppet-modules" ; \ - puppet apply -e "include bigtop_toolchain::installer" +RUN puppet apply -e "include bigtop_toolchain::installer" http://git-wip-us.apache.org/repos/asf/bigtop/blob/f436309e/docker/bigtop-slaves/centos-7/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/centos-7/Dockerfile b/docker/bigtop-slaves/centos-7/Dockerfile index 1332cc5..fb9d692 100644 --- a/docker/bigtop-slaves/centos-7/Dockerfile +++ b/docker/bigtop-slaves/centos-7/Dockerfile @@ -17,5 +17,4 @@ MAINTAINER [email protected] COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain -RUN puppet apply -e "include bigtop_toolchain::puppet-modules" ; \ - puppet apply -e "include bigtop_toolchain::installer" +RUN puppet apply -e "include bigtop_toolchain::installer" http://git-wip-us.apache.org/repos/asf/bigtop/blob/f436309e/docker/bigtop-slaves/debian-8/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/debian-8/Dockerfile b/docker/bigtop-slaves/debian-8/Dockerfile index a7659ae..e5e503a 100644 --- a/docker/bigtop-slaves/debian-8/Dockerfile +++ b/docker/bigtop-slaves/debian-8/Dockerfile @@ -17,5 +17,4 @@ MAINTAINER [email protected] COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain -RUN puppet apply -e "include bigtop_toolchain::puppet-modules" ; \ - puppet apply -e "include bigtop_toolchain::installer" +RUN puppet apply -e "include bigtop_toolchain::installer" http://git-wip-us.apache.org/repos/asf/bigtop/blob/f436309e/docker/bigtop-slaves/fedora-20/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/fedora-20/Dockerfile b/docker/bigtop-slaves/fedora-20/Dockerfile index 9e28bee..3b9e6ec 100644 --- a/docker/bigtop-slaves/fedora-20/Dockerfile +++ b/docker/bigtop-slaves/fedora-20/Dockerfile @@ -17,5 +17,4 @@ MAINTAINER [email protected] COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain -RUN puppet apply -e "include bigtop_toolchain::puppet-modules" ; \ - puppet apply -e "include bigtop_toolchain::installer" +RUN puppet apply -e "include bigtop_toolchain::installer" http://git-wip-us.apache.org/repos/asf/bigtop/blob/f436309e/docker/bigtop-slaves/opensuse-13.2/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/opensuse-13.2/Dockerfile b/docker/bigtop-slaves/opensuse-13.2/Dockerfile index 59064f3..bb4a258 100644 --- a/docker/bigtop-slaves/opensuse-13.2/Dockerfile +++ b/docker/bigtop-slaves/opensuse-13.2/Dockerfile @@ -17,5 +17,4 @@ MAINTAINER [email protected] COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain -RUN puppet apply -e "include bigtop_toolchain::puppet-modules" ; \ - puppet apply -e "include bigtop_toolchain::installer" +RUN puppet apply -e "include bigtop_toolchain::installer" http://git-wip-us.apache.org/repos/asf/bigtop/blob/f436309e/docker/bigtop-slaves/ubuntu-14.04/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/ubuntu-14.04/Dockerfile b/docker/bigtop-slaves/ubuntu-14.04/Dockerfile index cafcd69..4eda308 100644 --- a/docker/bigtop-slaves/ubuntu-14.04/Dockerfile +++ b/docker/bigtop-slaves/ubuntu-14.04/Dockerfile @@ -17,5 +17,4 @@ MAINTAINER [email protected] COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain -RUN puppet apply -e "include bigtop_toolchain::puppet-modules" ; \ - puppet apply -e "include bigtop_toolchain::installer" +RUN puppet apply -e "include bigtop_toolchain::installer"
