---
recipes/aeolus_recipe/manifests/conductor.pp | 27 ----------------------
recipes/aeolus_recipe/manifests/deltacloud.pp | 10 --------
recipes/aeolus_recipe/manifests/image-factory.pp | 8 ------
recipes/aeolus_recipe/manifests/iwhd.pp | 7 -----
4 files changed, 0 insertions(+), 52 deletions(-)
diff --git a/recipes/aeolus_recipe/manifests/conductor.pp
b/recipes/aeolus_recipe/manifests/conductor.pp
index ab679ca..e92fb81 100644
--- a/recipes/aeolus_recipe/manifests/conductor.pp
+++ b/recipes/aeolus_recipe/manifests/conductor.pp
@@ -166,33 +166,6 @@ class aeolus::conductor inherits aeolus {
}
class aeolus::conductor::disabled {
- ### Uninstall the aeolus components
- if $enable_packages {
- package {'rubygem-image_factory_connector':
- provider => 'yum', ensure => 'absent',
- require => Service['aeolus-connector']}
-
- package {['aeolus-conductor-daemons',
- 'aeolus-conductor-doc']:
- provider => 'yum', ensure => 'absent',
- require => Service['aeolus-conductor',
- 'conductor-condor_refreshd',
- 'conductor-warehouse_sync',
- 'conductor-dbomatic',
- 'conductor-delayed_job']}
-
- package {'aeolus-conductor':
- provider => 'yum', ensure => 'absent',
- require => [Package['aeolus-conductor-daemons',
- 'aeolus-conductor-doc'],
- Rails::Drop::Db["drop_aeolus_database"],
- Service['solr']] }
-
- package { 'rubygem-deltacloud-client':
- provider => 'yum', ensure => 'absent',
- require => [Package['aeolus-conductor']]}
- }
-
file {"/var/lib/aeolus-conductor":
ensure => absent,
force => true
diff --git a/recipes/aeolus_recipe/manifests/deltacloud.pp
b/recipes/aeolus_recipe/manifests/deltacloud.pp
index e1d313e..0c82a21 100644
--- a/recipes/aeolus_recipe/manifests/deltacloud.pp
+++ b/recipes/aeolus_recipe/manifests/deltacloud.pp
@@ -45,16 +45,6 @@ define aeolus::deltacloud($provider_type="",
$port="3002") {
}
define aeolus::deltacloud::disabled() {
- ### Uninstall the aeolus components
- if $enable_packages {
- package { 'rubygem-deltacloud-core':
- provider => 'yum', ensure => 'absent',
- require => Service["deltacloud-${name}"]}
- package { "rubygem-aws":
- provider => 'yum', ensure => 'absent',
- require => Service["deltacloud-${name}"]}
- }
-
### Stop the aeolus services
service { "deltacloud-${name}":
ensure => 'stopped',
diff --git a/recipes/aeolus_recipe/manifests/image-factory.pp
b/recipes/aeolus_recipe/manifests/image-factory.pp
index 39197a3..d2127e0 100644
--- a/recipes/aeolus_recipe/manifests/image-factory.pp
+++ b/recipes/aeolus_recipe/manifests/image-factory.pp
@@ -61,14 +61,6 @@ class aeolus::image-factory::disabled {
hasstatus => true,
enable => false}
- ### Uninstall the deltacloud components
- if $enable_packages {
- package { 'imagefactory':
- provider => 'yum', ensure => 'absent',
- require => Service['imagefactory']}
-
- }
-
### Destroy and cleanup aeolus artifacts
exec{"remove_aeolus_templates": command => "/bin/rm -rf
/templates"}
}
diff --git a/recipes/aeolus_recipe/manifests/iwhd.pp
b/recipes/aeolus_recipe/manifests/iwhd.pp
index c9fa956..0d962d7 100644
--- a/recipes/aeolus_recipe/manifests/iwhd.pp
+++ b/recipes/aeolus_recipe/manifests/iwhd.pp
@@ -47,13 +47,6 @@ class aeolus::iwhd::disabled {
ensure => 'stopped',
enable => false,
hasstatus => true}
-
- ### Uninstall the aeolus components
- if $enable_packages {
- package { 'iwhd':
- provider => 'yum', ensure => 'absent',
- require => [Package['aeolus-conductor'],
Service['iwhd']]}
- }
}
# Create a named bucket in iwhd
--
1.7.4.2