x/vmware-nsx
Code Issues Proposed changes

Merge "Add nova_ca_certificates_file option to neutron"

Browse Source
This commit is contained in:
Jenkins 2014-04-22 01:42:15 +00:00 committed by Gerrit Code Review
commit aef2c66433
3 changed files with 7 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 =
# CA file for novaclient to verify server certificates
# nova_ca_certificates_file =
# Boolean to control ignoring SSL errors on the nova url # Boolean to control ignoring SSL errors on the nova url
# nova_api_insecure = False # nova_api_insecure = False

3
neutron/common/config.py
View File

@ -100,6 +100,9 @@ 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.StrOpt('nova_ca_certificates_file',
default=None,
help=_('CA file for novaclient to verify server certificates')),
cfg.BoolOpt('nova_api_insecure', default=False, cfg.BoolOpt('nova_api_insecure', default=False,
help=_("If True, ignore any SSL validation issues")), help=_("If True, ignore any SSL validation issues")),
cfg.StrOpt('nova_region_name', cfg.StrOpt('nova_region_name',

1
neutron/notifiers/nova.py
View File

@ -49,6 +49,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,
cacert=cfg.CONF.nova_ca_certificates_file,
insecure=cfg.CONF.nova_api_insecure, 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,