You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2015/05/13 21:08:58 UTC
bigtop git commit: BIGTOP-1870. Latest version of Puppet::Apt doesn't
work for our deployment recipes
Repository: bigtop
Updated Branches:
refs/heads/master 0154e3c87 -> af8d003df
BIGTOP-1870. Latest version of Puppet::Apt doesn't work for our deployment recipes
Signed-off-by: Konstantin Boudnik <co...@wandisco.com>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/af8d003d
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/af8d003d
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/af8d003d
Branch: refs/heads/master
Commit: af8d003df86dc454832eb105d32402cbf8009c57
Parents: 0154e3c
Author: Evans Ye <ev...@apache.org>
Authored: Wed May 13 18:20:25 2015 +0000
Committer: Konstantin Boudnik <co...@wandisco.com>
Committed: Wed May 13 11:59:56 2015 -0700
----------------------------------------------------------------------
bigtop-deploy/puppet/manifests/site.pp | 11 +++++++----
bigtop-deploy/vm/utils/setup-env-centos.sh | 8 +-------
bigtop-deploy/vm/utils/setup-env-debian.sh | 6 ++----
bigtop-deploy/vm/vagrant-puppet-docker/provision.sh | 11 +++++------
4 files changed, 15 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/af8d003d/bigtop-deploy/puppet/manifests/site.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/manifests/site.pp b/bigtop-deploy/puppet/manifests/site.pp
index 04ccb1d..2095434 100644
--- a/bigtop-deploy/puppet/manifests/site.pp
+++ b/bigtop-deploy/puppet/manifests/site.pp
@@ -30,15 +30,18 @@ case $operatingsystem {
Yumrepo<||> -> Package<||>
}
/(Ubuntu|Debian)/: {
- class { "apt": disable_keys => true }
+ include apt
+ apt::conf { "disable_keys":
+ content => "APT::Get::AllowUnauthenticated 1;",
+ ensure => present
+ }
apt::source { "Bigtop":
location => hiera("bigtop::bigtop_repo_uri", $default_debrepo),
release => "bigtop",
repos => "contrib",
ensure => present,
- include_src => false,
- }
- Apt::Source<||> -> Package<||>
+ }
+ Apt::Source<||> -> Exec['apt_update'] -> Package<||>
}
default: {
notify{"WARNING: running on a neither yum nor apt platform -- make sure Bigtop repo is setup": }
http://git-wip-us.apache.org/repos/asf/bigtop/blob/af8d003d/bigtop-deploy/vm/utils/setup-env-centos.sh
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/utils/setup-env-centos.sh b/bigtop-deploy/vm/utils/setup-env-centos.sh
index e149dad..58cdd34 100755
--- a/bigtop-deploy/vm/utils/setup-env-centos.sh
+++ b/bigtop-deploy/vm/utils/setup-env-centos.sh
@@ -20,10 +20,7 @@ echo "$enable_local_repo"
# Install puppet agent
yum -y install http://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm
-yum -y install puppet
-cd /etc/puppet/modules && puppet module install puppetlabs/stdlib
-
-mkdir -p /data/{1,2}
+yum -y install puppet curl sudo unzip
# Setup rng-tools to improve virtual machine entropy performance.
# The poor entropy performance will cause kerberos provisioning failed.
@@ -31,9 +28,6 @@ yum -y install rng-tools
sed -i.bak 's/EXTRAOPTIONS=\"\"/EXTRAOPTIONS=\"-r \/dev\/urandom\"/' /etc/sysconfig/rngd
service rngd start
-# Install packages for smoke-tests
-yum -y install unzip
-
if [ $enable_local_repo == "true" ]; then
echo "Enabling local yum."
yum -y install yum-utils
http://git-wip-us.apache.org/repos/asf/bigtop/blob/af8d003d/bigtop-deploy/vm/utils/setup-env-debian.sh
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/utils/setup-env-debian.sh b/bigtop-deploy/vm/utils/setup-env-debian.sh
index 0528203..40fc0ea 100755
--- a/bigtop-deploy/vm/utils/setup-env-debian.sh
+++ b/bigtop-deploy/vm/utils/setup-env-debian.sh
@@ -17,11 +17,9 @@
enable_local_repo=${1:-false}
-apt-get update
# Install puppet agent
-apt-get -y install puppet puppet-module-puppetlabs-stdlib puppet-module-puppetlabs-apt curl
-
-mkdir -p /data/{1,2}
+apt-get update
+apt-get -y install puppet curl sudo unzip
# Setup rng-tools to improve virtual machine entropy performance.
# The poor entropy performance will cause kerberos provisioning failed.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/af8d003d/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh b/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh
index 48cb968..3fa9cac 100755
--- a/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh
@@ -23,13 +23,12 @@ umount /etc/hosts
mv /etc/hosts /etc/hosts.bak
ln -s /vagrant/hosts /etc/hosts
-# Prepare puppet configuration file
-if [ -f /etc/debian_version ] ; then
- apt-get -y install puppet-module-puppetlabs-stdlib
-else
- cd /etc/puppet/modules && puppet module install puppetlabs/stdlib
-fi
+# Install puppet modules
+puppet apply --modulepath=/bigtop-home -e "include bigtop_toolchain::puppet-modules"
+
+mkdir -p /data/{1,2}
+# Prepare puppet configuration file
mkdir -p /etc/puppet/hieradata
cp /bigtop-home/bigtop-deploy/puppet/hiera.yaml /etc/puppet
cp -r /bigtop-home/bigtop-deploy/puppet/hieradata/bigtop/ /etc/puppet/hieradata/