Merge lp:~jk0/nova/lp790900 into lp:~hudson-openstack/nova/trunk

[Josh Kearney]

Support SSL AMQP connections.

[Vish Ishaya (vishvananda)]

hehe. That was easy.

review: Approve

[Trey Morris (tr3buchet)]

:)

review: Approve

=== modified file 'nova/flags.py'
--- nova/flags.py	2011-05-24 20:19:09 +0000
+++ nova/flags.py	2011-06-01 19:51:15 +0000
@@ -296,6 +296,7 @@
             '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')

=== modified file 'nova/rpc.py'
--- nova/rpc.py	2011-05-27 00:06:52 +0000
+++ nova/rpc.py	2011-06-01 19:51:15 +0000
@@ -65,6 +65,7 @@
         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)