Add nova_ca_certificates_file option to neutron

Previously, neutron had no way to pass a certificates file to the
novaclient.  This change is to add that ability, similar to the way
you can pass a certificates file to neutronclient in nova.conf via
neturon_ca_certificates_file.

Change-Id: I1a3f85505eb44bee604900301af79d773e1952a3
Closes-Bug: #1309694

diff --git a/etc/neutron.conf b/etc/neutron.conf
index f116cdfd35725c3a0aff33ec5b8ee3278ca875be..119641b746119f158604f855cd30550a6b157b26 100644 (file)
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
@@ -320,6 +320,9 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
 # Authorization URL for connection to nova in admin context.
 # nova_admin_auth_url =
 
+# CA file for novaclient to verify server certificates
+# nova_ca_certificates_file =
+
 # Boolean to control ignoring SSL errors on the nova url
 # nova_api_insecure = False
 

diff --git a/neutron/common/config.py b/neutron/common/config.py
index 2ac76dad1267d787777fa12da5a1ba32469c75fd..c38a1c13c11ce7acd2124627b2ecf2f209e843dc 100644 (file)
--- a/neutron/common/config.py
+++ b/neutron/common/config.py
@@ -100,6 +100,9 @@ core_opts = [
                default='http://localhost:5000/v2.0',
                help=_('Authorization URL for connecting to nova in admin '
                       'context')),
+    cfg.StrOpt('nova_ca_certificates_file',
+               default=None,
+               help=_('CA file for novaclient to verify server certificates')),
     cfg.BoolOpt('nova_api_insecure', default=False,
                 help=_("If True, ignore any SSL validation issues")),
     cfg.StrOpt('nova_region_name',

diff --git a/neutron/notifiers/nova.py b/neutron/notifiers/nova.py
index 8633c990c76cd0894665c3db79975e3bd97bd7b0..bcb253ccfa7ea536e111637405fde2669a6637db 100644 (file)
--- a/neutron/notifiers/nova.py
+++ b/neutron/notifiers/nova.py
@@ -49,6 +49,7 @@ class Notifier(object):
             project_id=None,
             tenant_id=cfg.CONF.nova_admin_tenant_id,
             auth_url=cfg.CONF.nova_admin_auth_url,
+            cacert=cfg.CONF.nova_ca_certificates_file,
             insecure=cfg.CONF.nova_api_insecure,
             bypass_url=bypass_url,
             region_name=cfg.CONF.nova_region_name,