[PATCH] RM3172 Allow standalone imagefactory/iwhd installation

Richard Su rwsu at redhat.com
Wed May 9 22:01:52 UTC 2012


On 05/09/2012 09:10 AM, Steve Linabery wrote:
> ---
>   conf/iwhd_configure                       |    1 +
>   recipes/aeolus/manifests/image-factory.pp |    5 ++---
>   2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/conf/iwhd_configure b/conf/iwhd_configure
> index 5ed3b92..c3e90f2 100644
> --- a/conf/iwhd_configure
> +++ b/conf/iwhd_configure
> @@ -15,5 +15,6 @@
>   parameters:
>     enable_https: true
>     enable_security: false
> +  package_provider: rpm
>   classes:
>   - aeolus::iwhd
> diff --git a/recipes/aeolus/manifests/image-factory.pp b/recipes/aeolus/manifests/image-factory.pp
> index 0a1901f..efbce6d 100644
> --- a/recipes/aeolus/manifests/image-factory.pp
> +++ b/recipes/aeolus/manifests/image-factory.pp
> @@ -56,14 +56,13 @@ class aeolus::image-factory inherits aeolus {
>                     "set /files/etc/imagefactory/imagefactory.conf/dict/entry[. = 'warehouse_secret']/string \"$iwhd_oauth_password\"",
>                     "set /files/etc/imagefactory/imagefactory.conf/dict/entry[. = 'clients']/dict/entry \"$imagefactory_oauth_user\"",
>                     "set /files/etc/imagefactory/imagefactory.conf/dict/entry[. = 'clients']/dict/entry/string \"$imagefactory_oauth_password\""],
> -      require =>  [Package['imagefactory'],Package['aeolus-conductor']]
> +      require =>  [Package['imagefactory']]
>       }
>
>       $requires = [Package['imagefactory'],
>                    File['/var/tmp/imagefactory-mock'],
>                    Augeas['imagefactory.conf'],
> -                 Service[libvirtd],
> -                 Rails::Seed::Db[seed_aeolus_database]]
> +                 Service[libvirtd]]
>       service { 'imagefactory':
>         ensure  =>  'running',
>         enable  =>  true,
Ack. I can install imagefactory independently.

The oauth keys in /etc/imagefactory/imagefactory.conf and 
/etc/iwhd/user.js comes from 
/usr/share/aeolus-conductor/config/oauth.json. For next task, 3173, 
we'll need to make sure the files also contain the correct keys when 
imagefactory and iwhd are on a different host.



More information about the aeolus-devel mailing list