diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-13 16:36:38 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-13 16:36:38 +0000 |
| commit | 7aca22f407915d95c53ee65f4aac79cd4e6ab301 (patch) | |
| tree | e2e64304245bde3f0e89b450b90cd1539683cb67 /nova/flags.py | |
| parent | 3e3da6619a946db843533fafe33d6280948632fc (diff) | |
| parent | 7ca1669603132e3afd14606dda3f95ccbce08a41 (diff) | |
Merged with trunk
Fixed testing instrastructure:
- stubbed out LoopingCall.start
- unstubbed db.instance_create
- now using fake context in spawn tests
- moved fake xenstore ops into fake driver to avoid code duplication
Fixed pep8 errors
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/flags.py b/nova/flags.py index 62cbf30ca..9123e9ac7 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -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') |