diff --git a/etc/neutron.conf b/etc/neutron.conf index 193b0260a..f116cdfd3 100644 --- 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 = +# Boolean to control ignoring SSL errors on the nova url +# nova_api_insecure = False + # Number of seconds between sending events to nova if there are any events to send # send_events_interval = 2 diff --git a/neutron/common/config.py b/neutron/common/config.py index 25558311c..2ac76dad1 100644 --- a/neutron/common/config.py +++ b/neutron/common/config.py @@ -100,6 +100,8 @@ core_opts = [ default='http://localhost:5000/v2.0', help=_('Authorization URL for connecting to nova in admin ' 'context')), + cfg.BoolOpt('nova_api_insecure', default=False, + help=_("If True, ignore any SSL validation issues")), cfg.StrOpt('nova_region_name', help=_('Name of nova region to use. Useful if keystone manages' ' more than one region.')), diff --git a/neutron/notifiers/nova.py b/neutron/notifiers/nova.py index e8c560e48..4d268ec32 100644 --- a/neutron/notifiers/nova.py +++ b/neutron/notifiers/nova.py @@ -48,6 +48,7 @@ class Notifier(object): project_id=None, tenant_id=cfg.CONF.nova_admin_tenant_id, auth_url=cfg.CONF.nova_admin_auth_url, + insecure=cfg.CONF.nova_api_insecure, bypass_url=bypass_url, region_name=cfg.CONF.nova_region_name, extensions=[server_external_events])