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/11/19 21:48:39 UTC
[1/2] bigtop git commit: BIGTOP-2930: sqoop fedora26 : rsync missing
Repository: bigtop
Updated Branches:
refs/heads/master e92f21ac3 -> ae0880236
BIGTOP-2930: sqoop fedora26 : rsync missing
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/761d28d2
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/761d28d2
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/761d28d2
Branch: refs/heads/master
Commit: 761d28d216e55b540569d8b7ec29f9697708ca99
Parents: e92f21a
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Fri Nov 17 20:27:53 2017 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sun Nov 19 13:00:54 2017 +0100
----------------------------------------------------------------------
bigtop_toolchain/manifests/packages.pp | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/761d28d2/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index cfd5ed8..e58ea0c 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -18,6 +18,7 @@ class bigtop_toolchain::packages {
/(?i:(centos|fedora))/: {
$pkgs = [
"unzip",
+ "rsync",
"curl",
"wget",
"git",
[2/2] bigtop git commit: BIGTOP-2934: Consolidate puppet usage by
installing puppet from distro
Posted by of...@apache.org.
BIGTOP-2934: Consolidate puppet usage by installing puppet from distro
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ae088023
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ae088023
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ae088023
Branch: refs/heads/master
Commit: ae08802360f4edea5630b82327eaa91a5889350a
Parents: 761d28d
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sun Nov 19 13:05:27 2017 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sun Nov 19 22:48:04 2017 +0100
----------------------------------------------------------------------
bigtop_toolchain/bin/puppetize.sh | 43 +++++++++++++---------------------
1 file changed, 16 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ae088023/bigtop_toolchain/bin/puppetize.sh
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh
index 96031ee..a3f447a 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -22,39 +22,28 @@ fi
case ${ID}-${VERSION_ID} in
fedora-26)
- dnf -y install yum-utils
- dnf -y update
- dnf -y install hostname findutils curl sudo unzip wget puppet
+ dnf -y install yum-utils
+ dnf -y update
+ dnf -y install hostname findutils curl sudo unzip wget puppet puppetlabs-stdlib
;;
ubuntu-16.04)
apt-get update
- apt-get -y install wget curl sudo unzip puppet software-properties-common
- ;;
+ apt-get -y install wget curl sudo unzip puppet software-properties-common puppet-module-puppetlabs-apt puppet-module-puppetlabs-stdlib
+ ;;
debian-9*)
apt-get update
- apt-get -y install wget curl sudo unzip puppet
- ;;
+ apt-get -y install wget curl sudo unzip puppet puppet-module-puppetlabs-apt puppet-module-puppetlabs-stdlib
+ ;;
opensuse-42.3)
- zypper --gpg-auto-import-keys install -y curl sudo unzip wget puppet suse-release ca-certificates-mozilla net-tools tar
- ;;
+ zypper --gpg-auto-import-keys install -y curl sudo unzip wget puppet suse-release ca-certificates-mozilla net-tools tar
+ puppet module install puppetlabs-stdlib
+ ;;
centos-7*)
- if [ $HOSTTYPE = "x86_64" ] ; then
- rpm -ivh https://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm
- fi
- yum -y install hostname curl sudo unzip wget puppet
- ;;
+ rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+ yum -y install hostname curl sudo unzip wget puppet puppetlabs-stdlib
+ ;;
*)
- echo "Unsupported OS ${ID}-${VERSION_ID}."
- exit 1
-esac
-
-puppet module install puppetlabs-stdlib
-
-case ${ID} in
- debian|ubuntu)
- version=""
- if [ `puppet --version | cut -c1` -lt "4" ]; then
- version="--version 2.4.0"
- fi
- puppet module install puppetlabs-apt $version;;
+ echo "Unsupported OS ${ID}-${VERSION_ID}."
+ exit 1
+ ;;
esac