Skip to content
This repository has been archived by the owner on Aug 29, 2018. It is now read-only.

Commit

Permalink
RHEL fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
kraman committed Oct 29, 2013
1 parent 6e4b77a commit e5daf90
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 9 deletions.
8 changes: 5 additions & 3 deletions lib/vagrant-openshift/action/create_yum_repositories.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,15 @@ def call(env)
baseurl=http://yum.puppetlabs.com/el/6/products/x86_64/
enabled=1
gpgcheck=0
exclude=mcollective*
exclude=mcollective* activemq*
[puppet-deps]
name=Puppet-Deps
baseurl=http://yum.puppetlabs.com/el/6/dependencies/x86_64/
enabled=1
gpgcheck=0}}
gpgcheck=0
exclude=mcollective* activemq*
}}
end

if is_fedora
Expand All @@ -105,4 +107,4 @@ def call(env)
end
end
end
end
end
6 changes: 5 additions & 1 deletion lib/vagrant-openshift/action/install_build_dependencies.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ def call(env)
else
sudo(env[:machine], "yum install -y ruby193-rubygem-rake ruby193-build scl-utils-build")
#test dependencies
sudo(env[:machine], "yum install -y ruby193-rubygem-net-ssh ruby193-rubygem-archive-tar-minitar ruby193-rubygem-fakefs ruby193-rubygem-httpclient")
sudo(env[:machine], "yum install -y ruby193-rubygem-net-ssh ruby193-rubygem-archive-tar-minitar ruby193-rubygem-fakefs ruby193-rubygem-httpclient ruby193-rubygem-test-unit")
sudo(env[:machine], "yum install -y ruby193-rubygem-cucumber ruby193-rubygem-simplecov ruby193-rubygem-webmock ruby193-rubygem-poltergeist")

#rhc client dependencies for SCL Ruby 1.9.3 environment
sudo(env[:machine], "yum install -y rubygem-parseconfig ruby193-rubygem-net-ssh-multi ruby193-rubygem-commander ruby193-rubygem-open4")
end
@app.call(env)
end
Expand Down
11 changes: 7 additions & 4 deletions lib/vagrant-openshift/action/preserve_mcollective_logs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,13 @@ def initialize(app, env)
end

def call(env)
unless env[:machine].communicate.test("grep 'keeplogs=9999' /etc/mcollective/server.cfg")
is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
server_cfg_path = is_fedora ? '/etc/mcollective/server.cfg' : '/opt/rh/ruby193/root/etc/mcollective/server.cfg'

unless env[:machine].communicate.test("grep 'keeplogs=9999' #{server_cfg_path}")
env[:machine].ui.info "Keep all mcollective logs on remote instance"
sudo(env[:machine], "echo keeplogs=9999 >> /etc/mcollective/server.cfg")
is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
sudo(env[:machine], "echo keeplogs=9999 >> #{server_cfg_path}")

if is_fedora
sudo(env[:machine], "/sbin/service mcollective restart")
else
Expand All @@ -42,4 +45,4 @@ def call(env)
end
end
end
end
end
2 changes: 1 addition & 1 deletion lib/vagrant-openshift/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

module Vagrant
module Openshift
VERSION = "0.0.6"
VERSION = "0.0.7"
end
end

0 comments on commit e5daf90

Please sign in to comment.