Merge lp:~gnuoy/charms/trusty/neutron-openvswitch/fis-amqp-ssl into lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next

[Liam Young]

[Liam Young (gnuoy)]

Tested with full_stack/next_deploy_ssl lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs

[James Page (james-page)]

review: Approve

[James Page (james-page)]

review: Approve

=== modified file 'hooks/neutron_ovs_utils.py'
--- hooks/neutron_ovs_utils.py	2014-06-24 14:04:51 +0000
+++ hooks/neutron_ovs_utils.py	2015-01-28 10:19:54 +0000
@@ -18,7 +18,7 @@
     (NEUTRON_CONF, {
         'services': ['neutron-plugin-openvswitch-agent'],
         'contexts': [neutron_ovs_context.OVSPluginContext(),
-                     context.AMQPContext()],
+                     context.AMQPContext(ssl_dir=NEUTRON_CONF_DIR)],
     }),
     (ML2_CONF, {
         'services': ['neutron-plugin-openvswitch-agent'],