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 x86_64 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.
In the meantime for testing, there is a 512m i386 profile that will match to the small
instance on ec2. This has been made available for all profiles and has been named
small-i386.
hwp1 has also been renamed to small-x86_64.
---
recipes/aeolus/manifests/profiles/default.pp | 14 +++++++++++---
recipes/aeolus/manifests/profiles/ec2.pp | 11 ++++++-----
recipes/aeolus/manifests/profiles/mock.pp | 12 ++++++++++--
recipes/aeolus/manifests/profiles/rhevm.pp | 12 ++++++++++--
recipes/aeolus/manifests/profiles/vsphere.pp | 12 ++++++++++--
5 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/recipes/aeolus/manifests/profiles/default.pp
b/recipes/aeolus/manifests/profiles/default.pp
index 909f871..58bd35a 100644
--- a/recipes/aeolus/manifests/profiles/default.pp
+++ b/recipes/aeolus/manifests/profiles/default.pp
@@ -24,15 +24,23 @@ 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 => "",
architecture => "x86_64",
require => Aeolus::Conductor::Login["admin"] }
+ aeolus::conductor::hwp{"small-i386":
+ memory => "512",
+ cpu => "1",
+ storage => "",
+ architecture => "i386",
+ require => Aeolus::Conductor::Login["admin"] }
+
aeolus::conductor::logout{"admin":
- require => Aeolus::Conductor::Hwp['hwp1']}
+ require => [Aeolus::Conductor::Hwp['small-x86_64'],
+ Aeolus::Conductor::Hwp['small-i386']]}
}
diff --git a/recipes/aeolus/manifests/profiles/ec2.pp
b/recipes/aeolus/manifests/profiles/ec2.pp
index 0dc97f2..e348082 100644
--- a/recipes/aeolus/manifests/profiles/ec2.pp
+++ b/recipes/aeolus/manifests/profiles/ec2.pp
@@ -68,15 +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",
+ aeolus::conductor::hwp{"small-i386":
+ memory => "512",
cpu => "1",
storage => "",
architecture => "i386",
@@ -85,5 +85,6 @@ class aeolus::profiles::ec2 {
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'],
+ Aeolus::Conductor::Hwp['small-i386']] }
}
diff --git a/recipes/aeolus/manifests/profiles/mock.pp
b/recipes/aeolus/manifests/profiles/mock.pp
index 1e34c3a..7d97c9c 100644
--- a/recipes/aeolus/manifests/profiles/mock.pp
+++ b/recipes/aeolus/manifests/profiles/mock.pp
@@ -37,15 +37,23 @@ 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 => "",
architecture => "x86_64",
require => Aeolus::Conductor::Login["admin"] }
+ aeolus::conductor::hwp{"small-i386":
+ memory => "512",
+ cpu => "1",
+ storage => "",
+ architecture => "i386",
+ require => Aeolus::Conductor::Login["admin"] }
+
aeolus::conductor::logout{"admin":
require => [Aeolus::Conductor::Provider['mock'],
Aeolus::Conductor::Provider::Account['mock'],
- Aeolus::Conductor::Hwp['hwp1']] }
+ Aeolus::Conductor::Hwp['small-x86_64'],
+ Aeolus::Conductor::Hwp['small-i386']] }
}
diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp
b/recipes/aeolus/manifests/profiles/rhevm.pp
index 5d56f80..eeb58c6 100644
--- a/recipes/aeolus/manifests/profiles/rhevm.pp
+++ b/recipes/aeolus/manifests/profiles/rhevm.pp
@@ -33,15 +33,23 @@ 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 => "",
architecture => "x86_64",
require => Aeolus::Conductor::Login["admin"] }
+ aeolus::conductor::hwp{"small-i386":
+ memory => "512",
+ cpu => "1",
+ storage => "",
+ architecture => "i386",
+ require => Aeolus::Conductor::Login["admin"] }
+
aeolus::conductor::logout{"admin":
- require => Aeolus::Conductor::Hwp['hwp1']}
+ require => [Aeolus::Conductor::Hwp['small-x86_64'],
+ Aeolus::Conductor::Hwp['small-i386']]}
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..7465135 100644
--- a/recipes/aeolus/manifests/profiles/vsphere.pp
+++ b/recipes/aeolus/manifests/profiles/vsphere.pp
@@ -33,15 +33,23 @@ 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 => "",
architecture => "x86_64",
require => Aeolus::Conductor::Login["admin"] }
+ aeolus::conductor::hwp{"small-i386":
+ memory => "512",
+ cpu => "1",
+ storage => "",
+ architecture => "i386",
+ require => Aeolus::Conductor::Login["admin"] }
+
aeolus::conductor::logout{"admin":
- require => Aeolus::Conductor::Hwp['hwp1'] }
+ require => [Aeolus::Conductor::Hwp['small-x86_64'],
+ Aeolus::Conductor::Hwp['small-i386']] }
Aeolus::Conductor::Provider<| |> ->
Aeolus::Conductor::Logout["admin"]
}
--
1.7.7.6