On 03/22/2011 09:59 AM, Scott Seago wrote:
On 03/21/2011 04:34 PM, Mohammed Morsi wrote:
> - adds support for setting up and configuring multiple
> instances of the deltacloudd service
> - sets up providers for the mock and ec2 drivers
> - adds necessary data to the conductor db for these providers
> ---
> recipes/aeolus_recipe/aeolus_recipe.pp | 15 ++++-
> recipes/aeolus_recipe/aeolus_uninstall.pp | 4 +-
> recipes/aeolus_recipe/files/deltacloud-core | 77
> ----------------------
> recipes/aeolus_recipe/manifests/aeolus.pp | 12 ++++
> recipes/aeolus_recipe/manifests/conductor.pp | 36 ++++++++++
> recipes/aeolus_recipe/manifests/deltacloud.pp | 37 +++++++----
> recipes/aeolus_recipe/manifests/iwhd.pp | 1 -
> recipes/aeolus_recipe/templates/deltacloud-core | 79
> +++++++++++++++++++++++
> 8 files changed, 168 insertions(+), 93 deletions(-)
> delete mode 100644 recipes/aeolus_recipe/files/deltacloud-core
> create mode 100644 recipes/aeolus_recipe/templates/deltacloud-core
>
> diff --git a/recipes/aeolus_recipe/aeolus_recipe.pp
> b/recipes/aeolus_recipe/aeolus_recipe.pp
> index 65ae86f..317bf5e 100644
> --- a/recipes/aeolus_recipe/aeolus_recipe.pp
> +++ b/recipes/aeolus_recipe/aeolus_recipe.pp
> @@ -26,8 +26,8 @@
> import "aeolus_recipe/aeolus"
>
> # include the various aeolus components
> +include aeolus::deltacloud::core
> include aeolus::conductor
> -include aeolus::deltacloud
> include aeolus::image-factory
> include aeolus::iwhd
>
> @@ -38,3 +38,16 @@ aeolus::site_admin{"admin":
> password => 'password',
> first_name => 'aeolus',
> last_name => 'user'}
> +
> +aeolus::provider{"ec2":
> + port => 3002,
> + login_user => 'admin',
> + login_password => 'password',
> + require => Aeolus::Site_admin["admin"] }
> +
This isn't going to work as-is. Now that we support multiple amazon
regions, the only way factory knows what region to use is by the
provider name. Once we support multi-provider deltacloud cores this
problem goes away, but for now, 'name' is where we have to specify this.
So for now the ec2 provider needs to have the name 'ec2-us-east-1'
(provider type is still ec2 though).
See here for the list of valid ec2 provider names:
https://github.com/aeolusproject/image_factory/blob/master/imagefactory/b...
OK No biggie, will just modify the patch to separate the provider type
from the name and to update the name. By default do we want multiple
deltacloudd instances setup for all the Amazon regions, or do we just
want to stick with the one (ec2-us-east-1)?
-Mo