stackforge
/
puppet_openstack_builder
Code Issues Proposed changes

Fix augeas gem installs in bootstrap 

Augeas is handled separately so it should not
be installed along with other local gems.

Change-Id: I090a3c8f44a93e3a9a0edc65683ba263b7af7eae
This commit is contained in:
Michael Chapman 2014-07-21 14:41:57 +10:00
parent 85345062cc
commit ed79e0ad43
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/aptira/installer/bootstrap.sh
View File

@ -130,7 +130,7 @@ if ! gem list | grep ruby-augeas ; then
yum install -y -q gcc
if [ -f $dest/stacktira/contrib/aptira/gemcache/ruby-augeas* ] ; then
gem install --force --local $dest/stacktira/contrib/aptira/gemcache/ruby-augeas*
gem install --no-ri --no-rdoc --force --local $dest/stacktira/contrib/aptira/gemcache/ruby-augeas*
else
gem install ruby-augeas --no-ri --no-rdoc
fi
@ -152,11 +152,13 @@ if [ "${puppet_version}" != "${desired_puppet}" ] ; then
if [ -f $dest/stacktira/contrib/aptira/gemcache/puppet-$desired_puppet.gem ] ; then
echo "installing from local gem cache"
cd $dest/stacktira/contrib/aptira/gemcache
gem install --force --local *.gem
for i in $(ls | grep -v augeas); do
gem install --no-ri --no-rdoc --force --local $i
done
cd -
else
echo "no local gem cache found, installing puppet gem from internet"
gem install puppet ruby-augeas --no-ri --no-rdoc
gem install puppet --no-ri --no-rdoc
fi
else
echo "puppet version $desired_puppet already installed"