aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Flebbe <of@oflebbe.de>2015-10-09 20:49:58 +0200
committerOlaf Flebbe <of@oflebbe.de>2015-10-10 16:11:23 +0200
commitf436309e1d3b7553433b75da46986a0cd4cdcf90 (patch)
tree189987b390083b4b02d5f2e4f6baa3643fee8cfd
parent8048c8e960fab8db89f376646e08bd6c048a937b (diff)
downloadbigtop-odpi-f436309e1d3b7553433b75da46986a0cd4cdcf90.tar.gz
BIGTOP-2086: Install essential puppet modules along with puppet itself
-rwxr-xr-xbigtop_toolchain/bin/puppetize.sh7
-rw-r--r--docker/bigtop-slaves/centos-6/Dockerfile3
-rw-r--r--docker/bigtop-slaves/centos-7/Dockerfile3
-rw-r--r--docker/bigtop-slaves/debian-8/Dockerfile3
-rw-r--r--docker/bigtop-slaves/fedora-20/Dockerfile3
-rw-r--r--docker/bigtop-slaves/opensuse-13.2/Dockerfile3
-rw-r--r--docker/bigtop-slaves/ubuntu-14.04/Dockerfile3
7 files changed, 13 insertions, 12 deletions
diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh
index 84681f93..6facf14a 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
diff --git a/docker/bigtop-slaves/centos-6/Dockerfile b/docker/bigtop-slaves/centos-6/Dockerfile
index e5dba07f..90dc7fb0 100644
--- a/docker/bigtop-slaves/centos-6/Dockerfile
+++ b/docker/bigtop-slaves/centos-6/Dockerfile
@@ -17,5 +17,4 @@ MAINTAINER oflebbe@apache.org
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"
diff --git a/docker/bigtop-slaves/centos-7/Dockerfile b/docker/bigtop-slaves/centos-7/Dockerfile
index 1332cc52..fb9d6923 100644
--- a/docker/bigtop-slaves/centos-7/Dockerfile
+++ b/docker/bigtop-slaves/centos-7/Dockerfile
@@ -17,5 +17,4 @@ MAINTAINER oflebbe@apache.org
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"
diff --git a/docker/bigtop-slaves/debian-8/Dockerfile b/docker/bigtop-slaves/debian-8/Dockerfile
index a7659ae1..e5e503a9 100644
--- a/docker/bigtop-slaves/debian-8/Dockerfile
+++ b/docker/bigtop-slaves/debian-8/Dockerfile
@@ -17,5 +17,4 @@ MAINTAINER oflebbe@apache.org
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"
diff --git a/docker/bigtop-slaves/fedora-20/Dockerfile b/docker/bigtop-slaves/fedora-20/Dockerfile
index 9e28beea..3b9e6ec4 100644
--- a/docker/bigtop-slaves/fedora-20/Dockerfile
+++ b/docker/bigtop-slaves/fedora-20/Dockerfile
@@ -17,5 +17,4 @@ MAINTAINER oflebbe@apache.org
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"
diff --git a/docker/bigtop-slaves/opensuse-13.2/Dockerfile b/docker/bigtop-slaves/opensuse-13.2/Dockerfile
index 59064f31..bb4a2580 100644
--- a/docker/bigtop-slaves/opensuse-13.2/Dockerfile
+++ b/docker/bigtop-slaves/opensuse-13.2/Dockerfile
@@ -17,5 +17,4 @@ MAINTAINER evansye@apache.org
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"
diff --git a/docker/bigtop-slaves/ubuntu-14.04/Dockerfile b/docker/bigtop-slaves/ubuntu-14.04/Dockerfile
index cafcd695..4eda3080 100644
--- a/docker/bigtop-slaves/ubuntu-14.04/Dockerfile
+++ b/docker/bigtop-slaves/ubuntu-14.04/Dockerfile
@@ -17,5 +17,4 @@ MAINTAINER oflebbe@apache.org
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"