stackforge
/
puppet_openstack_builder
Code Issues Proposed changes

Merge "Fix ruby version detection in bootstrap"

This commit is contained in:
Jenkins 2014-07-24 21:54:02 +00:00 committed by Gerrit Code Review
parent fee21a7025 1b643da40b
commit 926e6fefe3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,11 @@ if ! yum list installed | grep libyaml ; then
yum install -y libyaml -q
fi
ruby_version=$(ruby --version | cut -d ' ' -f 2)
if hash ruby 2>/dev/null; then
ruby_version=$(ruby --version | cut -d ' ' -f 2)
else
ruby_version=0
fi
# Ruby 1.8.7 (standard on rhel 6) can give segfaults, so
# purge and install ruby 2.0.0
if [ "${ruby_version}" != "${desired_ruby}" ] ; then