Merge "Add nova_api_insecure flag to neutron"

This commit is contained in:
Jenkins 2014-04-14 14:39:46 +00:00 committed by Gerrit Code Review
commit 26b2281dcc
3 changed files with 6 additions and 0 deletions

View File

@ -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

View File

@ -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.')),

View File

@ -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])