On 05/27/11 - 10:06:49AM, Mark McLoughlin wrote:
Again, so that things work even if the config file isn't found.
---
imagefactory/ApplicationConfiguration.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/imagefactory/ApplicationConfiguration.py
b/imagefactory/ApplicationConfiguration.py
index 212319c..45c197f 100644
--- a/imagefactory/ApplicationConfiguration.py
+++ b/imagefactory/ApplicationConfiguration.py
@@ -86,10 +86,10 @@ class ApplicationConfiguration(object):
group_push.add_argument('--credentials', help='Cloud provider
credentials')
group_warehouse = argparser.add_argument_group(title='Image Warehouse',
description=warehouse_description)
group_warehouse.add_argument('--warehouse',
default='http://localhost:9090/', help='URL of the warehouse location to store
images. (default: %(default)s)')
- group_warehouse.add_argument('--image_bucket', help='Name of
warehouse bucket to look in for images. (default: %(default)s)')
- group_warehouse.add_argument('--template_bucket', help='Name of
warehouse bucket to look in for templates. (default: %(default)s)')
- group_warehouse.add_argument('--icicle_bucket', help='Name of
warehouse bucket to look in for icicles. (default: %(default)s)')
- group_warehouse.add_argument('--provider_bucket', help='Name of
warehouse bucket to look in for provider image instances. (default: %(default)s)')
+ group_warehouse.add_argument('--image_bucket', default='images',
help='Name of warehouse bucket to look in for images. (default: %(default)s)')
+ group_warehouse.add_argument('--template_bucket',
default='templates', help='Name of warehouse bucket to look in for templates.
(default: %(default)s)')
+ group_warehouse.add_argument('--icicle_bucket',
default='icicles', help='Name of warehouse bucket to look in for icicles.
(default: %(default)s)')
+ group_warehouse.add_argument('--provider_bucket',
default='providers', help='Name of warehouse bucket to look in for provider
image instances. (default: %(default)s)')
return argparser
Similar comments as I had for patch 6; I would like to see this more dynamic,
and possibly moved into the config file, but we need more input.
--
Chris Lalancette