diff options
| author | Chuck Short <zulcss@ubuntu.com> | 2011-03-13 21:28:20 -0400 |
|---|---|---|
| committer | Chuck Short <zulcss@ubuntu.com> | 2011-03-13 21:28:20 -0400 |
| commit | 1ecc7bba9bbd495ba6cec2b45488e779a73ca7dc (patch) | |
| tree | d57de3d5d0ca001995fd7ec62dffda8dc6013b25 /nova/flags.py | |
| parent | e502ad0243962aca98cc28bfa5cf69f8cd08991c (diff) | |
| parent | 3fb5da952e041f88a29ad0b049c52236b84954e9 (diff) | |
Merge trunk
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/flags.py b/nova/flags.py index 213d4d4e1..9123e9ac7 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -348,7 +348,7 @@ DEFINE_string('scheduler_manager', 'nova.scheduler.manager.SchedulerManager', 'Manager for scheduler') # The service to use for image search and retrieval -DEFINE_string('image_service', 'nova.image.s3.S3ImageService', +DEFINE_string('image_service', 'nova.image.local.LocalImageService', 'The service to use for retrieving and searching for images.') DEFINE_string('host', socket.gethostname(), @@ -356,3 +356,7 @@ DEFINE_string('host', socket.gethostname(), DEFINE_string('node_availability_zone', 'nova', 'availability zone of this node') + +DEFINE_string('zone_name', 'nova', 'name of this zone') +DEFINE_string('zone_capabilities', 'kypervisor:xenserver;os:linux', + 'Key/Value tags which represent capabilities of this zone') |