diff options
| author | Josh Kearney <josh@jk0.org> | 2011-06-01 14:46:05 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-06-01 14:46:05 -0500 |
| commit | d77aa5862762bc6efda46d92940143a1b9cbccf5 (patch) | |
| tree | 6701ee7c4dfed5d95994a0f73f390783f079c51b | |
| parent | a1e7f0884126fbc52e5295688f44fe9ebbea5873 (diff) | |
Allow SSL AMQP connections.
| -rw-r--r-- | nova/flags.py | 1 | ||||
| -rw-r--r-- | nova/rpc.py | 1 |
2 files changed, 2 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') diff --git a/nova/rpc.py b/nova/rpc.py index c5277c6a9..2e78a31e7 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -65,6 +65,7 @@ class Connection(carrot_connection.BrokerConnection): if new or not hasattr(cls, '_instance'): params = dict(hostname=FLAGS.rabbit_host, port=FLAGS.rabbit_port, + ssl=FLAGS.rabbit_use_ssl, userid=FLAGS.rabbit_userid, password=FLAGS.rabbit_password, virtual_host=FLAGS.rabbit_virtual_host) |