From: Dan Prince Date: Thu, 10 Apr 2014 16:40:13 +0000 (-0400) Subject: Make default nova_url use a version X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a53a404a97b1b67db46fb82b663cbfbf4a7ff835;p=openstack-build%2Fneutron-build.git Make default nova_url use a version The default nova_url for neutron is missing an API version number. This can cause requests to fail because the Nova /versions API cannot respond to Neutron notification requests. It seems reasonable for the default value to at least have a chance at being correct so this patch upgrades the default Nova API url to use the Nova 'v2' API. Related-bug: #1298640 Change-Id: Ib1449de84fbc01fb704ebfe4a016ac8f4932be96 (cherry picked from commit c09a14089a5ca7cd3093895ee0248876499a6d06) --- diff --git a/etc/neutron.conf b/etc/neutron.conf index 775c75725..e258720c5 100644 --- a/etc/neutron.conf +++ b/etc/neutron.conf @@ -303,7 +303,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier # notify_nova_on_port_data_changes = True # 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 # nova_region_name = diff --git a/neutron/common/config.py b/neutron/common/config.py index e04cc4e33..25558311c 100644 --- a/neutron/common/config.py +++ b/neutron/common/config.py @@ -87,7 +87,7 @@ core_opts = [ help=_("Send notification to nova when port data (fixed_ips/" "floatingip) changes so nova can update its cache.")), 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')), cfg.StrOpt('nova_admin_username', help=_('Username for connecting to nova in admin context')),