openstack
/
fuel-library
Code Issues Proposed changes

Change version rbenv-ruby to 1.9.3-p484 for nailgun 

Bug: https://github.com/wayneeseguin/rvm/issues/2320
Partial-bug: #1294602
Closes-Bug: #1327010
Change-Id: I8b376235eaa5701e99a7c9b8a28241f19965b19a
This commit is contained in:
Sergey Otpuschennikov 2014-03-18 17:24:42 +04:00 committed by Dmitry Burmistrov
parent 6d566c59e7
commit db24da4030
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment/puppet/nailgun/manifests/naily.pp
View File

@ -7,19 +7,19 @@ class nailgun::naily(
exec { 'install-naily-gem':
command => "/opt/rbenv/bin/rbenv exec gem install naily --source $gem_source --version $version --no-ri --no-rdoc",
environment => ['RBENV_ROOT=/opt/rbenv', 'RBENV_VERSION=1.9.3-p392'],
environment => ['RBENV_ROOT=/opt/rbenv', 'RBENV_VERSION=1.9.3-p484'],
require => Exec['configure-rubygems'],
logoutput => true,
}
exec { 'configure-rubygems':
command => '/opt/rbenv/bin/rbenv exec gem sources -r http://rubygems.org/',
environment => ['RBENV_ROOT=/opt/rbenv', 'RBENV_VERSION=1.9.3-p392'],
require => Package['rbenv-ruby-1.9.3-p392-0.0.1-1'],
environment => ['RBENV_ROOT=/opt/rbenv', 'RBENV_VERSION=1.9.3-p484'],
require => Package['rbenv-ruby-1.9.3-p484-0.0.1-1'],
logoutput => true,
}
package { 'rbenv-ruby-1.9.3-p392-0.0.1-1': }
package { 'rbenv-ruby-1.9.3-p484-0.0.1-1': }
file { '/usr/bin/nailyd':
content => template('nailgun/nailyd.erb'),

4
deployment/puppet/nailgun/templates/astute.erb
View File

@ -1,3 +1,3 @@
#!/bin/bash
RBENV_ROOT=/opt/rbenv RBENV_VERSION=1.9.3-p392 /opt/rbenv/bin/rbenv exec \
ruby -r 'rubygems' -e "gem 'astute', '>= 0'; load Gem.bin_path('astute', 'astute', '>= 0')" -- $@
RBENV_ROOT=/opt/rbenv RBENV_VERSION=1.9.3-p484 /opt/rbenv/bin/rbenv exec \
ruby -r 'rubygems' -e "gem 'astute', '>= 0'; load Gem.bin_path('astute', 'astute', '>= 0')" -- $@

4
deployment/puppet/nailgun/templates/nailyd.erb
View File

@ -1,3 +1,3 @@
#!/bin/bash
RBENV_ROOT=/opt/rbenv RBENV_VERSION=1.9.3-p392 exec /opt/rbenv/bin/rbenv exec \
ruby -r 'rubygems' -e "gem 'naily', '>= 0'; load Gem.bin_path('naily', 'nailyd', '>= 0')" -- $@
RBENV_ROOT=/opt/rbenv RBENV_VERSION=1.9.3-p484 exec /opt/rbenv/bin/rbenv exec \
ruby -r 'rubygems' -e "gem 'naily', '>= 0'; load Gem.bin_path('naily', 'nailyd', '>= 0')" -- $@