ACK and pushed.
-Mo
On 07/06/2011 07:37 PM, Richard Su wrote:
---
recipes/aeolus/manifests/conductor.pp | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/recipes/aeolus/manifests/conductor.pp
b/recipes/aeolus/manifests/conductor.pp
index 4687d32..b86e0ee 100644
--- a/recipes/aeolus/manifests/conductor.pp
+++ b/recipes/aeolus/manifests/conductor.pp
@@ -7,10 +7,6 @@ class aeolus::conductor inherits aeolus {
'aeolus-conductor-daemons']:
ensure => 'installed'}
- # to be renamed to aeolus-connector
- package {'rubygem-image_factory_connector':
- ensure => 'installed'}
-
file {"/var/lib/aeolus-conductor":
ensure => directory,
owner => 'aeolus',
@@ -44,13 +40,6 @@ class aeolus::conductor inherits aeolus {
Rails::Migrate::Db[migrate_aeolus_database],
Service['condor', 'httpd']] }
- service{ 'aeolus-connector':
- ensure => 'running',
- enable => true,
- hasstatus => true,
- require => [Package['rubygem-image_factory_connector'],
- Service[qpidd]]}
-
### Initialize and start the aeolus database
# Right now we configure and start postgres, at some point I want
# to make the db that gets setup configurable
@@ -147,7 +136,7 @@ class aeolus::conductor inherits aeolus {
}
### Setup sshd for deltacloud
- package { "openssh-server": ensure => installed }
+ package { "openssh-server": ensure => installed }
service{"sshd":
require => Package["openssh-server"],
ensure => 'running',
@@ -210,8 +199,7 @@ class aeolus::conductor::disabled {
'conductor-delayed_job'] }
service { ['aeolus-conductor',
'conductor-dbomatic',
- 'conductor-delayed_job',
- 'aeolus-connector']:
+ 'conductor-delayed_job']:
ensure => 'stopped',
enable => false,
hasstatus => true }
@@ -295,4 +283,3 @@ define aeolus::conductor::hwp($memory='', $cpu='',
$storage='', $architecture=''
require => Service['aeolus-conductor']
}
}
-