Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
bin/aeolus-check-services | 18 +-----------------
bin/aeolus-restart-services | 17 +----------------
recipes/aeolus/manifests/conductor.pp | 21 ++-------------------
spec/spec_helper.rb | 2 +-
4 files changed, 5 insertions(+), 53 deletions(-)
diff --git a/bin/aeolus-check-services b/bin/aeolus-check-services
index d7f2757..73accae 100755
--- a/bin/aeolus-check-services
+++ b/bin/aeolus-check-services
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-init_scripts=%w(aeolus-conductor condor deltacloud-core httpd imagefactory iwhd libvirtd
mongod ntpd postgresql qpidd)
+init_scripts=%w(aeolus-conductor deltacloud-core httpd imagefactory iwhd libvirtd mongod
ntpd postgresql qpidd)
init_scripts.each do |script|
puts "\nChecking #{script} ..."
@@ -26,19 +26,3 @@ init_scripts.each do |script|
puts " \e[1;31mFAILURE:\e[0m #{out.strip}"
end
end
-
-# Other checks
-commands = [
- {:name => 'condor_q', :command => 'condor_q'},
- {:name => 'condor_status', :command => 'condor_status'}
-]
-commands.each do |cmd|
- puts "\nChecking #{cmd[:name]} ..."
- cmd = "#{cmd[:command]}"
- out = `#{cmd}`
- if $?.to_i == 0
- puts " \e[1;32mSuccess:\e[0m #{out.strip}"
- else
- puts " \e[1;31mFAILURE:\e[0m #{out.strip}"
- end
-end
diff --git a/bin/aeolus-restart-services b/bin/aeolus-restart-services
index 41d199b..6df7205 100755
--- a/bin/aeolus-restart-services
+++ b/bin/aeolus-restart-services
@@ -15,7 +15,7 @@
# limitations under the License.
# ordered as in rc.d
-services = %w(mongod messagebus iwhd postgresql httpd qpidd deltacloud-core libvirtd
condor aeolus-conductor conductor-dbomatic imagefactory)
+services = %w(mongod messagebus iwhd postgresql httpd qpidd deltacloud-core libvirtd
aeolus-conductor conductor-dbomatic imagefactory)
def perform(action, svcs)
action = action.to_s
@@ -36,21 +36,6 @@ perform :stop, services.reverse
perform :start, services
## Other checks
-commands = [
- {:name => 'condor_q', :command => 'condor_q'},
- {:name => 'condor_status', :command => 'condor_status'}
-]
-
-commands.each do |cmd|
- puts "\nChecking #{cmd[:name]} ..."
- cmd = "#{cmd[:command]}"
- out = `#{cmd}`
- if $?.to_i == 0
- puts " \e[1;32mSuccess:\e[0m #{out.strip}"
- else
- puts " \e[1;31mFAILURE:\e[0m #{out.strip}"
- end
-end
if perform(:status, ['mongod']) == [1]
lockfile = '/var/lib/mongodb/mongod.lock'
diff --git a/recipes/aeolus/manifests/conductor.pp
b/recipes/aeolus/manifests/conductor.pp
index bf46d38..e5c63f5 100644
--- a/recipes/aeolus/manifests/conductor.pp
+++ b/recipes/aeolus/manifests/conductor.pp
@@ -19,7 +19,6 @@ class aeolus::conductor inherits aeolus {
# specific versions of these two packages are needed and we need to pull the third
in
package {['aeolus-conductor',
'aeolus-conductor-daemons',
- 'condor',
'aeolus-all']:
ensure => 'installed',
provider => $package_provider }
@@ -33,22 +32,6 @@ class aeolus::conductor inherits aeolus {
### Setup selinux for deltacloud
selinux::mode{"permissive":}
- ### Start the aeolus services
- file {"/etc/condor/config.d/10deltacloud.config":
- source => "puppet:///modules/aeolus/condor_config.local",
- require => Package['aeolus-conductor-daemons', 'condor'] }
- # condor requires an explicit non-localhost hostname
- # TODO we can also kill the configure sequence here instead
- exec{"/bin/echo 'hostname/domain should be explicitly set and should not be
localhost.localdomain'":
- logoutput => true,
- onlyif => "/usr/bin/test `/bin/hostname` =
'localhost.localdomain'"
- }
- service { ['condor']:
- ensure => 'running',
- enable => true,
- hasstatus => true,
- require => File['/etc/condor/config.d/10deltacloud.config'] }
-
### Setup apache for deltacloud
include apache
if $enable_https {
@@ -64,7 +47,7 @@ class aeolus::conductor inherits aeolus {
hasstatus => true,
require => [Package['aeolus-conductor-daemons'],
Rails::Migrate::Db[migrate_aeolus_database],
- Service['condor', 'httpd'],
+ Service['httpd'],
Apache::Site[aeolus-conductor], Exec[reload-apache]] }
### Initialize and start the aeolus database
@@ -137,7 +120,7 @@ class aeolus::conductor::disabled {
}
### Stop the aeolus services
- service { ['condor', 'httpd']:
+ service { ['httpd']:
ensure => 'stopped',
enable => false,
require => Service['aeolus-conductor',
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 21a08f7..654acce 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -31,7 +31,7 @@ AEOLUS_DEPENDENCY_PACKAGES = ['rubygem-aws', 'curl',
'java-1.6.0-openjdk', 'open
'appliance-tools', 'livecd-tools',
'python-imgcreate']
# TODO want to include httpd, qpidd here as well but that requires elevated permissions
-AEOLUS_DEPENDENCY_SERVICES = ['mongod', 'condor', 'sshd',
'postgresql']
+AEOLUS_DEPENDENCY_SERVICES = ['mongod', 'sshd', 'postgresql']
IWHD_URI='http://localhost:9090/'
--
1.7.4.4