---
recipes/aeolus_recipe/aeolus_recipe.pp | 1 -
recipes/aeolus_recipe/manifests/deltacloud.pp | 16 ++++++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/recipes/aeolus_recipe/aeolus_recipe.pp
b/recipes/aeolus_recipe/aeolus_recipe.pp
index a371845..f2f4110 100644
--- a/recipes/aeolus_recipe/aeolus_recipe.pp
+++ b/recipes/aeolus_recipe/aeolus_recipe.pp
@@ -26,7 +26,6 @@
import "aeolus_recipe/aeolus"
# include the various aeolus components
-include aeolus::deltacloud::core
include aeolus::conductor
include aeolus::image-factory
include aeolus::iwhd
diff --git a/recipes/aeolus_recipe/manifests/deltacloud.pp
b/recipes/aeolus_recipe/manifests/deltacloud.pp
index eaab24e..af6da11 100644
--- a/recipes/aeolus_recipe/manifests/deltacloud.pp
+++ b/recipes/aeolus_recipe/manifests/deltacloud.pp
@@ -10,15 +10,23 @@ class aeolus::deltacloud::core {
}
}
-# install the deltacloud component w/ the specified driver
-define aeolus::deltacloud($provider_type="", $port="3002") {
+class aeolus::deltacloud::ec2 {
### Install the driver-specific components
- $enable_ec2_packages = $enable_packages and $provider_type == "ec2"
- if $enable_ec2_packages {
+ if $enable_packages {
# install ec2 support,
package { "rubygem-aws":
provider => 'yum', ensure => 'installed' }
}
+}
+
+
+# install the deltacloud component w/ the specified driver
+define aeolus::deltacloud($provider_type="", $port="3002") {
+ include aeolus::deltacloud::core
+
+ if $provider_type == "ec2" {
+ include aeolus::deltacloud::ec2
+ }
### we need to sync time to communicate w/ cloud providers
include ntp::client
--
1.7.2.3
_______________________________________________
aeolus-devel mailing list
aeolus-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/aeolus-devel