---
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
Show replies by date