openstack
/
neutron-lbaas
Code Issues Proposed changes

Merge "Make default nova_url use a version"

This commit is contained in:
Jenkins 2014-04-13 08:05:28 +00:00 committed by Gerrit Code Review
parent 55fcddc28e c09a14089a
commit 22814c341a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/neutron.conf
View File

@ -303,7 +303,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
# notify_nova_on_port_data_changes = True # notify_nova_on_port_data_changes = True
# URL for connection to nova (Only supports one nova region currently). # URL for connection to nova (Only supports one nova region currently).
# nova_url = http://127.0.0.1:8774 # nova_url = http://127.0.0.1:8774/v2
# Name of nova region to use. Useful if keystone manages more than one region # Name of nova region to use. Useful if keystone manages more than one region
# nova_region_name = # nova_region_name =

2
neutron/common/config.py
View File

@ -87,7 +87,7 @@ core_opts = [
help=_("Send notification to nova when port data (fixed_ips/" help=_("Send notification to nova when port data (fixed_ips/"
"floatingip) changes so nova can update its cache.")), "floatingip) changes so nova can update its cache.")),
cfg.StrOpt('nova_url', cfg.StrOpt('nova_url',
default='http://127.0.0.1:8774', default='http://127.0.0.1:8774/v2',
help=_('URL for connection to nova')), help=_('URL for connection to nova')),
cfg.StrOpt('nova_admin_username', cfg.StrOpt('nova_admin_username',
help=_('Username for connecting to nova in admin context')), help=_('Username for connecting to nova in admin context')),