[PATCH aeolus-configure] Allow standalone imagefactory/iwhd installation
Steve Linabery
slinaber at redhat.com
Wed May 9 00:19:04 UTC 2012
---
conf/imagefactory_configure | 2 +-
conf/iwhd_configure | 1 +
recipes/aeolus/manifests/image-factory.pp | 5 ++---
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/conf/imagefactory_configure b/conf/imagefactory_configure
index ed15806..805df23 100644
--- a/conf/imagefactory_configure
+++ b/conf/imagefactory_configure
@@ -1,4 +1,4 @@
parameters:
- package_provider: rpm
+ package_provider: yum
classes:
- aeolus::image-factory
diff --git a/conf/iwhd_configure b/conf/iwhd_configure
index 5ed3b92..b507e88 100644
--- a/conf/iwhd_configure
+++ b/conf/iwhd_configure
@@ -15,5 +15,6 @@
parameters:
enable_https: true
enable_security: false
+ package_provider: yum
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,
--
1.7.6.5
More information about the aeolus-devel
mailing list