[PATCH configure] BZ 802847 - cleanup hardware profiles and fix provider ordering effects
Scott Seago
sseago at redhat.com
Tue Mar 20 19:14:38 UTC 2012
On 03/19/2012 05:26 PM, Richard Su wrote:
> This revised patch removes the i386 hwp.
>
> https://bugzilla.redhat.com/show_bug.cgi?id=802847
>
> Reverted the hwp1 memory change. Setting the memory to 7500 is incompatible with vsphere. vsphere provider hwp memory range is 512-2048.
>
> Setting memory back to 512m for the default profile. Once the conductor and deltacloud changes described in this patch is in.
>
> https://fedorahosted.org/pipermail/aeolus-devel/2012-March/009611.html
>
> We will be able to start using the small instances in ec2.
>
> hwp1 has also been renamed to small-x86_64.
> ---
> recipes/aeolus/manifests/profiles/default.pp | 6 +++---
> recipes/aeolus/manifests/profiles/ec2.pp | 13 +++----------
> recipes/aeolus/manifests/profiles/mock.pp | 4 ++--
> recipes/aeolus/manifests/profiles/rhevm.pp | 4 ++--
> recipes/aeolus/manifests/profiles/vsphere.pp | 4 ++--
> 5 files changed, 12 insertions(+), 19 deletions(-)
>
> diff --git a/recipes/aeolus/manifests/profiles/default.pp b/recipes/aeolus/manifests/profiles/default.pp
> index 909f871..5bb3119 100644
> --- a/recipes/aeolus/manifests/profiles/default.pp
> +++ b/recipes/aeolus/manifests/profiles/default.pp
> @@ -24,8 +24,8 @@ class aeolus::profiles::default {
>
> aeolus::conductor::login{"admin": password => "password",
> require => Aeolus::Conductor::Site_admin['admin']}
> -
> - aeolus::conductor::hwp{"hwp1":
> +
> + aeolus::conductor::hwp{"small-x86_64":
> memory => "512",
> cpu => "1",
> storage => "",
> @@ -33,6 +33,6 @@ class aeolus::profiles::default {
> require => Aeolus::Conductor::Login["admin"] }
>
> aeolus::conductor::logout{"admin":
> - require => Aeolus::Conductor::Hwp['hwp1']}
> + require => Aeolus::Conductor::Hwp['small-x86_64']}
>
> }
> diff --git a/recipes/aeolus/manifests/profiles/ec2.pp b/recipes/aeolus/manifests/profiles/ec2.pp
> index 0dc97f2..3f63f70 100644
> --- a/recipes/aeolus/manifests/profiles/ec2.pp
> +++ b/recipes/aeolus/manifests/profiles/ec2.pp
> @@ -68,22 +68,15 @@ class aeolus::profiles::ec2 {
> url => 'http://localhost:3002/api',
> require => Aeolus::Conductor::Login["admin"] }
>
> - aeolus::conductor::hwp{"hwp1":
> - memory => "7500",
> + aeolus::conductor::hwp{"small-x86_64":
> + memory => "512",
> cpu => "1",
> storage => "",
> architecture => "x86_64",
> require => Aeolus::Conductor::Login["admin"] }
>
> - aeolus::conductor::hwp{"small":
> - memory => "500",
> - cpu => "1",
> - storage => "",
> - architecture => "i386",
> - require => Aeolus::Conductor::Login["admin"] }
> -
> Aeolus::Conductor::Provider<| |> -> Aeolus::Conductor::Logout<| |>
>
> aeolus::conductor::logout{"admin":
> - require => [Aeolus::Conductor::Hwp['hwp1'], Aeolus::Conductor::Hwp['small']] }
> + require => Aeolus::Conductor::Hwp['small-x86_64'] }
> }
> diff --git a/recipes/aeolus/manifests/profiles/mock.pp b/recipes/aeolus/manifests/profiles/mock.pp
> index 1e34c3a..c68829c 100644
> --- a/recipes/aeolus/manifests/profiles/mock.pp
> +++ b/recipes/aeolus/manifests/profiles/mock.pp
> @@ -37,7 +37,7 @@ class aeolus::profiles::mock {
> password => 'mockpassword',
> require => Aeolus::Conductor::Provider["mock"] }
>
> - aeolus::conductor::hwp{"hwp1":
> + aeolus::conductor::hwp{"small-x86_64":
> memory => "512",
> cpu => "1",
> storage => "",
> @@ -47,5 +47,5 @@ class aeolus::profiles::mock {
> aeolus::conductor::logout{"admin":
> require => [Aeolus::Conductor::Provider['mock'],
> Aeolus::Conductor::Provider::Account['mock'],
> - Aeolus::Conductor::Hwp['hwp1']] }
> + Aeolus::Conductor::Hwp['small-x86_64']] }
> }
> diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp b/recipes/aeolus/manifests/profiles/rhevm.pp
> index 5d56f80..547d7a9 100644
> --- a/recipes/aeolus/manifests/profiles/rhevm.pp
> +++ b/recipes/aeolus/manifests/profiles/rhevm.pp
> @@ -33,7 +33,7 @@ class aeolus::profiles::rhevm ($instances) {
> aeolus::conductor::login{"admin": password => "password",
> require => Aeolus::Conductor::Site_admin['admin']}
>
> - aeolus::conductor::hwp{"hwp1":
> + aeolus::conductor::hwp{"small-x86_64":
> memory => "512",
> cpu => "1",
> storage => "",
> @@ -41,7 +41,7 @@ class aeolus::profiles::rhevm ($instances) {
> require => Aeolus::Conductor::Login["admin"] }
>
> aeolus::conductor::logout{"admin":
> - require => Aeolus::Conductor::Hwp['hwp1']}
> + require => Aeolus::Conductor::Hwp['small-x86_64']}
>
> Aeolus::Conductor::Provider<| |> -> Aeolus::Conductor::Logout["admin"]
> # TODO: create a realm and mappings
> diff --git a/recipes/aeolus/manifests/profiles/vsphere.pp b/recipes/aeolus/manifests/profiles/vsphere.pp
> index 4d17c1c..dcca15b 100644
> --- a/recipes/aeolus/manifests/profiles/vsphere.pp
> +++ b/recipes/aeolus/manifests/profiles/vsphere.pp
> @@ -33,7 +33,7 @@ class aeolus::profiles::vsphere ($instances) {
> aeolus::conductor::login{"admin": password => "password",
> require => Aeolus::Conductor::Site_admin['admin']}
>
> - aeolus::conductor::hwp{"hwp1":
> + aeolus::conductor::hwp{"small-x86_64":
> memory => "512",
> cpu => "1",
> storage => "",
> @@ -41,7 +41,7 @@ class aeolus::profiles::vsphere ($instances) {
> require => Aeolus::Conductor::Login["admin"] }
>
> aeolus::conductor::logout{"admin":
> - require => Aeolus::Conductor::Hwp['hwp1'] }
> + require => Aeolus::Conductor::Hwp['small-x86_64'] }
>
> Aeolus::Conductor::Provider<| |> -> Aeolus::Conductor::Logout["admin"]
> }
ACK to both this patch and the conductor one ([PATCH conductor] BZ
802847 - fix hwp matching when there are multiple values for
architecture)
Scott
More information about the aeolus-devel
mailing list