various configure fixes
by Mo Morsi
These are various unrelated fixes for configure.
They should be able to be independently reviewed
12 years, 10 months
[PATCH configure] clear condor job in aeolus-cleanup
by Mo Morsi
---
recipes/aeolus/lib/facter/condor.rb | 10 ++++++++++
recipes/aeolus/manifests/conductor.pp | 12 ++++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 recipes/aeolus/lib/facter/condor.rb
diff --git a/recipes/aeolus/lib/facter/condor.rb b/recipes/aeolus/lib/facter/condor.rb
new file mode 100644
index 0000000..fd8fbef
--- /dev/null
+++ b/recipes/aeolus/lib/facter/condor.rb
@@ -0,0 +1,10 @@
+# adds facts pertaining to condor
+# TODO this probably can be sent upstream as well
+
+Facter.add("condor_jobs") do
+ setcode do
+ output = %x{condor_q}
+ output =~ /([0-9]*)\sjobs/
+ $1.chomp
+ end
+end
diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp
index f14ea45..8c0bc9b 100644
--- a/recipes/aeolus/manifests/conductor.pp
+++ b/recipes/aeolus/manifests/conductor.pp
@@ -199,13 +199,21 @@ class aeolus::conductor::disabled {
force => true
}
+ ### Remove condor jobs
+ if "${condor_jobs}" != "0" {
+ exec{"remove_condor_jobs": command => "/usr/bin/condor_rm -all" }
+ }else{
+ exec{"remove_condor_jobs": command => "/bin/echo 'no condor jobs'" }
+ }
+
### Stop the aeolus services
service { ['condor', 'httpd']:
ensure => 'stopped',
enable => false,
- require => Service['aeolus-conductor',
+ require => [Service['aeolus-conductor',
'conductor-dbomatic',
- 'conductor-delayed_job'] }
+ 'conductor-delayed_job'],
+ Exec['remove_condor_jobs']] }
service { ['aeolus-conductor',
'conductor-dbomatic',
'conductor-delayed_job',
--
1.7.5.4
12 years, 10 months
[PATCH aeolus] BZ#714286 - Fixed bug in matching code for realm
by Martyn Taylor
From: Martyn Taylor <mtaylor(a)redhat.com>
---
src/app/util/condormatic.rb | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index 107ad6e..ed5ef5a 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -52,8 +52,11 @@ def match(instance)
if not instance.frontend_realm.nil?
instance.frontend_realm.realm_backend_targets.each do |brealm_target|
if brealm_target.target_provider == account.provider
- possibles << Possible.new(pool_family, account, hwp, pi,
- brealm_target.target_realm)
+ possibles << Possible.new(pool_family, account, hwp, pi, nil)
+ elsif !brealm_target.target_realm.nil?
+ if brealm_target.target_realm.provider == account.provider
+ possibles << Possible.new(pool_family, account, hwp, pi, brealm_target.target_realm)
+ end
end
end
else
--
1.7.4
12 years, 10 months
rubygem-right_aws dependency problem
by Justin Clift
Hi Michal,
Noticed rubygem-aws has made it to stable, so tried it out with Aeolus 0.2.0.
Turns out there's still a dependency prob. :(
Looks like it's caused by a related-sounding gem, rubygem-right_aws:
Error: Package: rubygem-right_aws-2.0.0-1.fc14.noarch (fedora)
Requires: rubygem(right_http_connection) >= 1.2.4
Available: rubygem-right_http_connection-1.2.4-2.fc14.noarch (fedora)
rubygem(right_http_connection) = 1.2.4
You could try using --skip-broken to work around the problem
You could try running: rpm -Va --nofiles --nodigest
That's from a standard Aeolus 0.2.0 install. Looks like it needs the
'Requires: rubygem-http_connection' update as well. (haven't tested it though)
Nicely, this gem has your name on it in brew. So I guess you're already pretty
familiar with it. :)
Would you be ok to whip up a new version of it, with an appropriate dependency
fix?
Regards and best wishes,
Justin Clift
--
Aeolus Community Manager
http://www.aeolusproject.org
12 years, 10 months
[PATCH] Remove rb-inotify as a dependency.
by Chris Lalancette
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
aeolus-conductor.spec.in | 1 -
src/config/environment.rb | 1 -
2 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index ea71746..1b06b58 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -27,7 +27,6 @@ Requires: rubygem(compass-960-plugin)
Requires: rubygem(simple-navigation)
Requires: rubygem(typhoeus)
Requires: rubygem(rest-client)
-Requires: rubygem(rb-inotify)
Requires: rubygem(builder)
Requires: rubygem(json)
Requires: rubygem(rack-restful_submit)
diff --git a/src/config/environment.rb b/src/config/environment.rb
index 7aa96e8..feaffc8 100644
--- a/src/config/environment.rb
+++ b/src/config/environment.rb
@@ -49,7 +49,6 @@ Rails::Initializer.run do |config|
config.gem "simple-navigation"
config.gem "typhoeus"
config.gem 'rest-client', :version => '>= 1.6.1'
- config.gem "rb-inotify"
config.gem 'rack-restful_submit', :version => '1.1.2'
config.gem 'sunspot_rails', :lib => 'sunspot/rails'
config.gem 'delayed_job', :version => '~>2.0.4'
--
1.7.4.4
12 years, 10 months
[PATCH aeolus] Fixed Error in Matching for Realm Selection
by Martyn Taylor
From: Martyn Taylor <mtaylor(a)redhat.com>
---
src/app/util/condormatic.rb | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index 107ad6e..8f17073 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -51,9 +51,16 @@ def match(instance)
provider_images.select {|pi| pi.provider == account.provider}.each do |pi|
if not instance.frontend_realm.nil?
instance.frontend_realm.realm_backend_targets.each do |brealm_target|
+
+ # If this backend target is a provider, add all the realms for this provider to the possible matches
if brealm_target.target_provider == account.provider
- possibles << Possible.new(pool_family, account, hwp, pi,
- brealm_target.target_realm)
+ brealm_target.target_provider.realms.each do |realm|
+ possibles << Possible.new(pool_family, account, hwp, pi, realm)
+ end
+
+ # If this target is a realm then add this realm to the possible matches
+ elsif not brealm_target.target_realm.nil? && brealm_target.target_realm.provider == accounts.provider
+ possibles << Possible.new(pool_family, account, hwp, pi, brealm_target.target_realm)
end
end
else
--
1.7.4
12 years, 10 months
[PATCH] Fix failing user spec
by Jirka Tomasek
From: Jiri Tomasek <jtomasek(a)redhat.com>
---
src/spec/controllers/users_controller_spec.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/spec/controllers/users_controller_spec.rb b/src/spec/controllers/users_controller_spec.rb
index 20d46e8..66bb50a 100644
--- a/src/spec/controllers/users_controller_spec.rb
+++ b/src/spec/controllers/users_controller_spec.rb
@@ -84,7 +84,7 @@ describe UsersController do
UserSession.create(@tuser)
put :update, :id => @tuser.id, :user => {}, :commit => 'Save'
- response.should redirect_to(root_path)
+ response.should redirect_to(user_path(@tuser))
end
end
--
1.7.4.2
12 years, 10 months
failure of oz during install
by Steven Dake
Chris,
I have had oz fail perhaps two times in the last few weeks I have been
using it. It looks to me to be a libvirtd problem. I have also had
libvirtd crash once. It always seems to be around the time that the vm
is finished installing - then oz-install blocks. I am not entirely sure
what the issue is, but I'd speculate the doman is killed and then the
block device stats are read, which results in badness (rather then a
raise). I don't know for sure though, and don't have a clear reproduer.
callback such as it is:
Waiting for F15-x86_64-jeos to finish installing, 49630/50000
Waiting for F15-x86_64-jeos to finish installing, 49620/50000
^CLibvirt Domain Info Failed:
code is 38
domain is 13
message is poll on socket failed: Interrupted system call
level is 2
str1 is %s
str2 is poll on socket failed: Interrupted system call
str3 is None
int1 is -1
int2 is -1
Cleaning up guest named F15-x86_64-jeos
Cleaning up after install
Removing modified ISO
Traceback (most recent call last):
File "/usr/bin/oz-install", line 139, in <module>
libvirt_xml = guest.install(timeout, force_download)
File "/usr/lib/python2.7/site-packages/oz/Guest.py", line 1156, in install
return self.do_install(timeout, force, 0)
File "/usr/lib/python2.7/site-packages/oz/Guest.py", line 1141, in
do_install
self.wait_for_install_finish(dom, timeout)
File "/usr/lib/python2.7/site-packages/oz/Guest.py", line 432, in
wait_for_install_finish
rd_req, rd_bytes, wr_req, wr_bytes, errs =
libvirt_dom.blockStats(diskdev)
File "/usr/lib64/python2.7/site-packages/libvirt.py", line 760, in
blockStats
if ret is None: raise libvirtError ('virDomainBlockStats() failed',
dom=self)
libvirt.libvirtError: poll on socket failed: Interrupted system call
12 years, 10 months