---
recipes/aeolus_recipe/aeolus_recipe.pp | 2 +-
recipes/aeolus_recipe/aeolus_uninstall.pp | 2 +-
recipes/aeolus_recipe/manifests/aeolus.pp | 2 +-
recipes/aeolus_recipe/manifests/core.pp | 35 -------------------------
recipes/aeolus_recipe/manifests/deltacloud.pp | 35 +++++++++++++++++++++++++
5 files changed, 38 insertions(+), 38 deletions(-)
delete mode 100644 recipes/aeolus_recipe/manifests/core.pp
create mode 100644 recipes/aeolus_recipe/manifests/deltacloud.pp
diff --git a/recipes/aeolus_recipe/aeolus_recipe.pp
b/recipes/aeolus_recipe/aeolus_recipe.pp
index af6a6ac..65ae86f 100644
--- a/recipes/aeolus_recipe/aeolus_recipe.pp
+++ b/recipes/aeolus_recipe/aeolus_recipe.pp
@@ -27,7 +27,7 @@ import "aeolus_recipe/aeolus"
# include the various aeolus components
include aeolus::conductor
-include aeolus::core
+include aeolus::deltacloud
include aeolus::image-factory
include aeolus::iwhd
diff --git a/recipes/aeolus_recipe/aeolus_uninstall.pp
b/recipes/aeolus_recipe/aeolus_uninstall.pp
index c1b02c4..4399ac3 100644
--- a/recipes/aeolus_recipe/aeolus_uninstall.pp
+++ b/recipes/aeolus_recipe/aeolus_uninstall.pp
@@ -27,6 +27,6 @@ import "aeolus_recipe/aeolus"
# disable the various aeolus components
include aeolus::conductor::disabled
-include aeolus::core::disabled
+include aeolus::deltacloud::disabled
include aeolus::iwhd::disabled
include aeolus::image-factory::disabled
diff --git a/recipes/aeolus_recipe/manifests/aeolus.pp
b/recipes/aeolus_recipe/manifests/aeolus.pp
index f4242d1..da67c9b 100644
--- a/recipes/aeolus_recipe/manifests/aeolus.pp
+++ b/recipes/aeolus_recipe/manifests/aeolus.pp
@@ -8,7 +8,7 @@ import "selinux"
import "ntp"
import "conductor"
-import "core"
+import "deltacloud"
import "iwhd"
import "image-factory"
diff --git a/recipes/aeolus_recipe/manifests/core.pp
b/recipes/aeolus_recipe/manifests/core.pp
deleted file mode 100644
index 62fb784..0000000
--- a/recipes/aeolus_recipe/manifests/core.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-# Aeolus core puppet definitions
-
-class aeolus::core inherits aeolus {
- ### Install the aeolus components
- package { 'rubygem-deltacloud-core':
- provider => 'yum', ensure => 'installed', require =>
Yumrepo['aeolus_arch', 'aeolus_noarch']}
- file { "/var/log/deltacloud-core": ensure => 'directory' }
-
- ### we need to sync time to communicate w/ cloud providers
- include ntp::client
-
- ### Start the aeolus services
- file {"/etc/init.d/deltacloud-core":
- source => "puppet:///modules/aeolus_recipe/deltacloud-core",
- mode => 755 }
- service { 'deltacloud-core':
- ensure => 'running',
- enable => true,
- require => [Package['rubygem-deltacloud-core'],
- File['/etc/init.d/deltacloud-core']] }
-}
-
-class aeolus::core::disabled {
- ### Uninstall the aeolus components
- package { 'rubygem-deltacloud-core':
- provider => 'yum', ensure => 'absent',
- require => Service['deltacloud-core']}
-
- ### Stop the aeolus services
- service { 'deltacloud-core':
- ensure => 'stopped',
- enable => false,
- hasstatus => true}
-}
-
diff --git a/recipes/aeolus_recipe/manifests/deltacloud.pp
b/recipes/aeolus_recipe/manifests/deltacloud.pp
new file mode 100644
index 0000000..3803561
--- /dev/null
+++ b/recipes/aeolus_recipe/manifests/deltacloud.pp
@@ -0,0 +1,35 @@
+# Aeolus deltacloud puppet definitions
+
+class aeolus::deltacloud inherits aeolus {
+ ### Install the aeolus components
+ package { 'rubygem-deltacloud-core':
+ provider => 'yum', ensure => 'installed', require =>
Yumrepo['aeolus_arch', 'aeolus_noarch']}
+ file { "/var/log/deltacloud-core": ensure => 'directory' }
+
+ ### we need to sync time to communicate w/ cloud providers
+ include ntp::client
+
+ ### Start the aeolus services
+ file {"/etc/init.d/deltacloud-core":
+ source => "puppet:///modules/aeolus_recipe/deltacloud-core",
+ mode => 755 }
+ service { 'deltacloud-core':
+ ensure => 'running',
+ enable => true,
+ require => [Package['rubygem-deltacloud-core'],
+ File['/etc/init.d/deltacloud-core']] }
+}
+
+class aeolus::deltacloud::disabled {
+ ### Uninstall the aeolus components
+ package { 'rubygem-deltacloud-core':
+ provider => 'yum', ensure => 'absent',
+ require => Service['deltacloud-core']}
+
+ ### Stop the aeolus services
+ service { 'deltacloud-core':
+ ensure => 'stopped',
+ enable => false,
+ hasstatus => true}
+}
+
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
