Signed-off-by: Chris Lalancette clalance@redhat.com --- recipes/aeolus/manifests/conductor.pp | 12 ++++-------- spec/spec_helper.rb | 1 - 2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp index ad9d358..42ea2fc 100644 --- a/recipes/aeolus/manifests/conductor.pp +++ b/recipes/aeolus/manifests/conductor.pp @@ -31,8 +31,7 @@ class aeolus::conductor inherits aeolus { hasstatus => true, require => File['/etc/condor/config.d/10deltacloud.config'] } service { ['aeolus-conductor', - 'conductor-dbomatic', - 'conductor-delayed_job']: + 'conductor-dbomatic' ]: ensure => 'running', enable => true, hasstatus => true, @@ -164,11 +163,9 @@ class aeolus::conductor::disabled { ensure => 'stopped', enable => false, require => Service['aeolus-conductor', - 'conductor-dbomatic', - 'conductor-delayed_job'] } + 'conductor-dbomatic'] } service { ['aeolus-conductor', - 'conductor-dbomatic', - 'conductor-delayed_job']: + 'conductor-dbomatic']: ensure => 'stopped', enable => false, hasstatus => true } @@ -178,8 +175,7 @@ class aeolus::conductor::disabled { cwd => "/usr/share/aeolus-conductor", rails_env => "production", require => Service["aeolus-conductor", - "conductor-dbomatic", - "conductor-delayed_job"]} + "conductor-dbomatic"]} postgres::user{"aeolus": ensure => 'dropped', require => Rails::Drop::Db["drop_aeolus_database"]} diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 61523a7..4332150 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -12,7 +12,6 @@ AEOLUS_PACKAGES = ['iwhd', 'imagefactory',
AEOLUS_SERVICES = ['iwhd', 'deltacloud-mock', 'deltacloud-ec2-us-east-1', 'deltacloud-ec2-us-west-1', 'imagefactory', 'aeolus-conductor', 'conductor-dbomatic'] - # 'conductor-delayed_job'] TODO where is the init script for this?
AEOLUS_DEPENDENCY_PACKAGES = ['rubygem-aws', 'curl', 'java-1.6.0-openjdk', 'openssh-server', 'appliance-tools', 'livecd-tools', 'python-imgcreate']