Browse code

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

Zuul authored on 2018/03/19 02:24:30
Showing 2 changed files
... ...
@@ -336,7 +336,6 @@ function configure_neutron_nova_new {
336 336
     iniset $NOVA_CONF neutron project_domain_name "Default"
337 337
     iniset $NOVA_CONF neutron auth_strategy $NEUTRON_AUTH_STRATEGY
338 338
     iniset $NOVA_CONF neutron region_name "$REGION_NAME"
339
-    iniset $NOVA_CONF neutron url $NEUTRON_SERVICE_PROTOCOL://$NEUTRON_SERVICE_HOST:$NEUTRON_SERVICE_PORT
340 339
 
341 340
     iniset $NOVA_CONF DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
342 341
 
... ...
@@ -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