x/vmware-nsx
Code Issues Proposed changes

Add nova_api_insecure flag to neutron

Browse Source 
Neutron did not have any way to allow SSL validation problems in the
novaclient similar to the way nova has the neutron_api_insecure flag.
This change adds the nova_api_insecure flag to the neutron config and
also passes it in the novaclient instantiation.

Change-Id: Ifed581df253c01fab9dc1f22c8187876271b378e
Closes-Bug: #1306822
This commit is contained in:
Paul Ward 2014-04-12 10:18:18 -05:00
parent 61f158cce2
commit 52724eacbe
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/neutron.conf
View File

@ -320,6 +320,9 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
# Authorization URL for connection to nova in admin context. # Authorization URL for connection to nova in admin context.
# nova_admin_auth_url = # 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 # Number of seconds between sending events to nova if there are any events to send
# send_events_interval = 2 # send_events_interval = 2

2
neutron/common/config.py
View File

@ -100,6 +100,8 @@ core_opts = [
default='http://localhost:5000/v2.0', default='http://localhost:5000/v2.0',
help=_('Authorization URL for connecting to nova in admin ' help=_('Authorization URL for connecting to nova in admin '
'context')), 'context')),
cfg.BoolOpt('nova_api_insecure', default=False,
help=_("If True, ignore any SSL validation issues")),
cfg.StrOpt('nova_region_name', cfg.StrOpt('nova_region_name',
help=_('Name of nova region to use. Useful if keystone manages' help=_('Name of nova region to use. Useful if keystone manages'
' more than one region.')), ' more than one region.')),

1
neutron/notifiers/nova.py
View File

@ -48,6 +48,7 @@ class Notifier(object):
project_id=None, project_id=None,
tenant_id=cfg.CONF.nova_admin_tenant_id, tenant_id=cfg.CONF.nova_admin_tenant_id,
auth_url=cfg.CONF.nova_admin_auth_url, auth_url=cfg.CONF.nova_admin_auth_url,
insecure=cfg.CONF.nova_api_insecure,
bypass_url=bypass_url, bypass_url=bypass_url,
region_name=cfg.CONF.nova_region_name, region_name=cfg.CONF.nova_region_name,
extensions=[server_external_events]) extensions=[server_external_events])