[PATCH configure] BZ 723585 - Modified default hwp1 to be compatible with EC2, RHEV, and vSphere

[Richard Su]

Removed provider specific hardware profiles for RHEV and vSphere.
---
 recipes/aeolus/manifests/conductor.pp |    4 ++--
 recipes/aeolus/manifests/rhevm.pp     |   12 +-----------
 recipes/aeolus/manifests/vmware.pp    |    7 -------
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp
index afd55e5..d7bfb79 100644
--- a/recipes/aeolus/manifests/conductor.pp
+++ b/recipes/aeolus/manifests/conductor.pp
@@ -139,9 +139,9 @@ class aeolus::conductor::seed_data {
         require        => Aeolus::Site_admin["admin"] }

aeolus::conductor::hwp{"hwp1":
-        memory         => "1",
+        memory         => "512",
         cpu            => "1",
-        storage        => "1",
+        storage        => "",
         architecture   => "x86_64",
         require        => Aeolus::Site_admin["admin"] }

diff --git a/recipes/aeolus/manifests/rhevm.pp b/recipes/aeolus/manifests/rhevm.pp
index de6f4fd..daa84d2 100644
--- a/recipes/aeolus/manifests/rhevm.pp
+++ b/recipes/aeolus/manifests/rhevm.pp
@@ -27,16 +27,6 @@ class aeolus::rhevm inherits aeolus  {
                 File["/etc/rhevm.json"],
                 File["/etc/iwhd/conf.js"]]}

-  aeolus::conductor::hwp{"rhevm-hwp":
-    memory       => "512",
-    cpu          => "1",
-    storage      => "1",
-    architecture => "x86_64",
-    require      => Aeolus::Site_admin["admin"] }
-
-  # break up aeolus::provider into its individual steps for two reasons:
-  # 1. deltacloudd expects "rhevm", imagefactory expects "rhev-m" passed through by conductor
-  # 2. rhevm-hwp must exist before creating provider
   aeolus::deltacloud{"rhevm":
     provider_type => 'rhevm',
     endpoint => "$rhevm_deltacloud_powershell_url",
@@ -45,7 +35,7 @@ class aeolus::rhevm inherits aeolus  {
   aeolus::conductor::provider{"rhevm":
     type           => "rhevm",
     url            => "http://localhost:$%7Brhevm_deltacloud_port%7D/api",
-    require        => [Aeolus::Deltacloud["rhevm"],Aeolus::Conductor::Hwp["rhevm-hwp"]]}
+    require        => Aeolus::Deltacloud["rhevm"]}

# TODO:
   # 1. since we have credentials, create provider account
diff --git a/recipes/aeolus/manifests/vmware.pp b/recipes/aeolus/manifests/vmware.pp
index 61e861d..4772b15 100644
--- a/recipes/aeolus/manifests/vmware.pp
+++ b/recipes/aeolus/manifests/vmware.pp
@@ -4,13 +4,6 @@ class aeolus::vmware inherits aeolus  {
     mode => 755,
     require => Package['aeolus-conductor-daemons'] }

-  aeolus::conductor::hwp{"vsphere-hwp":
-    memory       => "256",
-    cpu          => "",
-    storage      => "",
-    architecture => "x86_64",
-    require      => Aeolus::Site_admin["admin"] }
-
   aeolus::deltacloud{"vsphere":
     provider_type => 'vsphere',
     endpoint => "$vmware_api_endpoint",

[Scott Seago]

On 07/20/2011 03:39 PM, Richard Su wrote:
> Removed provider specific hardware profiles for RHEV and vSphere.
>
> recipes/aeolus/manifests/conductor.pp |    4 ++--
>   recipes/aeolus/manifests/rhevm.pp     |   12 +-----------
>   recipes/aeolus/manifests/vmware.pp    |    7 -------
>   3 files changed, 3 insertions(+), 20 deletions(-)
>
> diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp
> index afd55e5..d7bfb79 100644
> --- a/recipes/aeolus/manifests/conductor.pp
> +++ b/recipes/aeolus/manifests/conductor.pp
> @@ -139,9 +139,9 @@ class aeolus::conductor::seed_data {
>           require        =>  Aeolus::Site_admin["admin"] }
>   aeolus::conductor::hwp{"hwp1":
>    memory         =>  "1",
>    memory         =>  "512",
>     cpu            =>  "1",
>    storage        =>  "1",
>    storage        =>  "",
>     architecture   =>  "x86_64",
>     require        =>  Aeolus::Site_admin["admin"] }
>
> diff --git a/recipes/aeolus/manifests/rhevm.pp b/recipes/aeolus/manifests/rhevm.pp
> index de6f4fd..daa84d2 100644
> --- a/recipes/aeolus/manifests/rhevm.pp
> +++ b/recipes/aeolus/manifests/rhevm.pp
> @@ -27,16 +27,6 @@ class aeolus::rhevm inherits aeolus  {
>                   File["/etc/rhevm.json"],
>                   File["/etc/iwhd/conf.js"]]}
> aeolus::conductor::hwp{"rhevm-hwp":
> memory       =>  "512",
> cpu          =>  "1",
> storage      =>  "1",
> architecture =>  "x86_64",
> require      =>  Aeolus::Site_admin["admin"] }
> # break up aeolus::provider into its individual steps for two reasons:
> # 1. deltacloudd expects "rhevm", imagefactory expects "rhev-m" passed through by conductor
> # 2. rhevm-hwp must exist before creating provider
>  aeolus::deltacloud{"rhevm":
>    provider_type =>  'rhevm',
>    endpoint =>  "$rhevm_deltacloud_powershell_url",
>
> @@ -45,7 +35,7 @@ class aeolus::rhevm inherits aeolus  {
>     aeolus::conductor::provider{"rhevm":
>       type           =>  "rhevm",
>       url            =>  "http://localhost:$%7Brhevm_deltacloud_port%7D/api",
> require        =>  [Aeolus::Deltacloud["rhevm"],Aeolus::Conductor::Hwp["rhevm-hwp"]]}
>
> require        =>  Aeolus::Deltacloud["rhevm"]}
>
> # TODO:
> # 1. since we have credentials, create provider account
>
> diff --git a/recipes/aeolus/manifests/vmware.pp b/recipes/aeolus/manifests/vmware.pp
> index 61e861d..4772b15 100644
> --- a/recipes/aeolus/manifests/vmware.pp
> +++ b/recipes/aeolus/manifests/vmware.pp
> @@ -4,13 +4,6 @@ class aeolus::vmware inherits aeolus  {
>       mode =>  755,
>       require =>  Package['aeolus-conductor-daemons'] }
> aeolus::conductor::hwp{"vsphere-hwp":
> memory       =>  "256",
> cpu          =>  "",
> storage      =>  "",
> architecture =>  "x86_64",
> require      =>  Aeolus::Site_admin["admin"] }
> aeolus::deltacloud{"vsphere":
>     provider_type =>  'vsphere',
>     endpoint =>  "$vmware_api_endpoint",

ACK,

Works for me.

Scott