---
recipes/aeolus/files/condor_config.local | 5 -----
recipes/aeolus/manifests/conductor.pp | 4 ----
spec/spec_helper.rb | 2 +-
3 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/recipes/aeolus/files/condor_config.local
b/recipes/aeolus/files/condor_config.local
index 76a97b5..fea6da5 100644
--- a/recipes/aeolus/files/condor_config.local
+++ b/recipes/aeolus/files/condor_config.local
@@ -16,8 +16,3 @@ COLLECTOR_DEBUG = D_FULLDEBUG
DELTACLOUD_GAHP = $(SBIN)/deltacloud_gahp
CLASSAD_LIFETIME = 0
-
-# for the event log parsing (i.e. dbomatic)
-EVENT_LOG=$(LOG)/EventLog
-EVENT_LOG_USE_XML=True
-EVENT_LOG_JOB_AD_INFORMATION_ATTRS=Owner,GlobalJobId,Cmd,JobStartDate,JobCurrentStartDate,JobFinishedHookDone,DeltacloudProviderId,DeltacloudPublicNetworkAddresses,DeltacloudPrivateNetworkAddresses,DeltacloudAvailableActions,JobStatus,DeltacloudUsername
diff --git a/recipes/aeolus/manifests/conductor.pp
b/recipes/aeolus/manifests/conductor.pp
index 144f698..d59da65 100644
--- a/recipes/aeolus/manifests/conductor.pp
+++ b/recipes/aeolus/manifests/conductor.pp
@@ -34,7 +34,6 @@ class aeolus::conductor inherits aeolus {
require => File['/var/lib/condor/condor_config.local'] }
service { ['aeolus-conductor',
'conductor-warehouse_sync',
- 'conductor-dbomatic',
'conductor-delayed_job']:
ensure => 'running',
enable => true,
@@ -220,12 +219,10 @@ class aeolus::conductor::disabled {
enable => false,
require => [Service['aeolus-conductor',
'conductor-warehouse_sync',
- 'conductor-dbomatic',
'conductor-delayed_job'],
Exec['remove_condor_jobs']] }
service { ['aeolus-conductor',
'conductor-warehouse_sync',
- 'conductor-dbomatic',
'conductor-delayed_job',
'aeolus-connector']:
ensure => 'stopped',
@@ -238,7 +235,6 @@ class aeolus::conductor::disabled {
rails_env => "production",
require => Service["aeolus-conductor",
'conductor-warehouse_sync',
- "conductor-dbomatic",
"conductor-delayed_job"]}
postgres::user{"aeolus":
ensure => 'dropped',
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ecf5ae5..64acc38 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -11,7 +11,7 @@ AEOLUS_PACKAGES = ['iwhd', 'imagefactory',
'aeolus-configure']
AEOLUS_SERVICES = ['iwhd', 'deltacloud-mock',
'deltacloud-ec2-us-east-1', 'deltacloud-ec2-us-west-1',
'imagefactory',
- 'aeolus-conductor', 'conductor-dbomatic']
+ 'aeolus-conductor']
# 'conductor-delayed_job'] TODO where is the init script for
this?
AEOLUS_DEPENDENCY_PACKAGES = ['rubygem-aws', 'curl',
'java-1.6.0-openjdk', 'openssh-server',
--
1.7.5.4