summaryrefslogtreecommitdiffstats
path: root/nova/flags.py
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-06-01 19:44:01 -0400
committerTodd Willey <todd@ansolabs.com>2011-06-01 19:44:01 -0400
commit5c187a17216b76d730c3dcf983f905d2b5ce1bd9 (patch)
tree2136b5a09676ab57b67fec842b47757a52c2906e /nova/flags.py
parent2c1dd72060fccbe7f32a6aa08c1ce67476806680 (diff)
parent78093e8101d1981fc1fbafc963023bc70ad6b3b6 (diff)
Merge trunk.
Diffstat (limited to 'nova/flags.py')
-rw-r--r--nova/flags.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 9eaac5596..d5090edba 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -296,6 +296,7 @@ DEFINE_bool('fake_network', False,
'should we use fake network devices and addresses')
DEFINE_string('rabbit_host', 'localhost', 'rabbit host')
DEFINE_integer('rabbit_port', 5672, 'rabbit port')
+DEFINE_bool('rabbit_use_ssl', False, 'connect over SSL')
DEFINE_string('rabbit_userid', 'guest', 'rabbit userid')
DEFINE_string('rabbit_password', 'guest', 'rabbit password')
DEFINE_string('rabbit_virtual_host', '/', 'rabbit virtual host')