1. devstack
  2. Commit ca61966f47af9070a7c6ed6fef3f2d630c43c919
Browse code

neutron: Do no longer set "url" in nova.conf

Since[1], "url" in the [neutron] section in nova.conf should no
longer be set.

[1]
https://github.com/openstack/nova/commit/6cde77ebbab85bc8ccd2ab7ad977b1d4af4a13fa

Depends-On: https://review.openstack.org/548572
Related-Bug: #1752289
Change-Id: Ied6c155da9d51a25ba7a524e69d018d39ed3442c

Thomas Bechtold authored on 2018/02/28 22:46:05
Showing 2 changed files
lib/neutron
History View file @ ca61966
... ... 
@@ -306,7 +306,6 @@ function configure_neutron_nova_new {
306 306 
     iniset $NOVA_CONF neutron project_domain_name "Default"
307 307 
     iniset $NOVA_CONF neutron auth_strategy $NEUTRON_AUTH_STRATEGY
308 308 
     iniset $NOVA_CONF neutron region_name "$REGION_NAME"
309 
-    iniset $NOVA_CONF neutron url $NEUTRON_SERVICE_PROTOCOL://$NEUTRON_SERVICE_HOST:$NEUTRON_SERVICE_PORT
310 309
311 310 
     iniset $NOVA_CONF DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
312 311
lib/neutron-legacy
History View file @ ca61966
... ... 
@@ -376,7 +376,6 @@ function create_nova_conf_neutron {
376 376 
     iniset $NOVA_CONF neutron project_domain_name "$SERVICE_DOMAIN_NAME"
377 377 
     iniset $NOVA_CONF neutron auth_strategy "$Q_AUTH_STRATEGY"
378 378 
     iniset $NOVA_CONF neutron region_name "$REGION_NAME"
379 
-    iniset $NOVA_CONF neutron url "${Q_PROTOCOL}://$Q_HOST:$Q_PORT"
380 379
381 380 
     if [[ "$Q_USE_SECGROUP" == "True" ]]; then
382 381 
         LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver