summaryrefslogtreecommitdiffstats
path: root/nova/flags.py
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2011-08-29 08:07:34 -0700
committerChris Behrens <cbehrens@codestud.com>2011-08-29 08:07:34 -0700
commitc0775bfd7d6f2b21b95e459e4c78c5ed9b445efe (patch)
treeabaf7375f24384def97c4f19dbc655a9cb1895c6 /nova/flags.py
parent25cd526a72a98f184ed57fc85e7be2997305ce31 (diff)
parente103b1c471d1f507075542b795d8620a89132de9 (diff)
downloadnova-c0775bfd7d6f2b21b95e459e4c78c5ed9b445efe.tar.gz
nova-c0775bfd7d6f2b21b95e459e4c78c5ed9b445efe.tar.xz
nova-c0775bfd7d6f2b21b95e459e4c78c5ed9b445efe.zip
merged trunk
Diffstat (limited to 'nova/flags.py')
-rw-r--r--nova/flags.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 774da4ab4..aa76defe5 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -292,6 +292,7 @@ DEFINE_string('ajax_console_proxy_url',
in the form "http://127.0.0.1:8000"')
DEFINE_string('ajax_console_proxy_port',
8000, 'port that ajax_console_proxy binds')
+DEFINE_string('vsa_topic', 'vsa', 'the topic that nova-vsa service listens on')
DEFINE_bool('verbose', False, 'show debug output')
DEFINE_boolean('fake_rabbit', False, 'use a fake rabbit')
DEFINE_bool('fake_network', False,
@@ -375,6 +376,17 @@ DEFINE_string('volume_manager', 'nova.volume.manager.VolumeManager',
'Manager for volume')
DEFINE_string('scheduler_manager', 'nova.scheduler.manager.SchedulerManager',
'Manager for scheduler')
+DEFINE_string('vsa_manager', 'nova.vsa.manager.VsaManager',
+ 'Manager for vsa')
+DEFINE_string('vc_image_name', 'vc_image',
+ 'the VC image ID (for a VC image that exists in DB Glance)')
+# VSA constants and enums
+DEFINE_string('default_vsa_instance_type', 'm1.small',
+ 'default instance type for VSA instances')
+DEFINE_integer('max_vcs_in_vsa', 32,
+ 'maxinum VCs in a VSA')
+DEFINE_integer('vsa_part_size_gb', 100,
+ 'default partition size for shared capacity')
# The service to use for image search and retrieval
DEFINE_string('image_service', 'nova.image.glance.GlanceImageService',