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]6cde77ebba
Related-Bug: #1752289 Change-Id: Ied6c155da9d51a25ba7a524e69d018d39ed3442c (cherry picked from commitca61966f47
)
This commit is contained in:
parent
bb0c101c0c
commit
2f0858e25c
|
@ -307,7 +307,6 @@ function configure_neutron_nova_new {
|
|||
iniset $NOVA_CONF neutron project_domain_name "Default"
|
||||
iniset $NOVA_CONF neutron auth_strategy $NEUTRON_AUTH_STRATEGY
|
||||
iniset $NOVA_CONF neutron region_name "$REGION_NAME"
|
||||
iniset $NOVA_CONF neutron url $NEUTRON_SERVICE_PROTOCOL://$NEUTRON_SERVICE_HOST:$NEUTRON_SERVICE_PORT
|
||||
|
||||
iniset $NOVA_CONF DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
|
||||
|
||||
|
|
|
@ -376,7 +376,6 @@ function create_nova_conf_neutron {
|
|||
iniset $NOVA_CONF neutron project_domain_name "$SERVICE_DOMAIN_NAME"
|
||||
iniset $NOVA_CONF neutron auth_strategy "$Q_AUTH_STRATEGY"
|
||||
iniset $NOVA_CONF neutron region_name "$REGION_NAME"
|
||||
iniset $NOVA_CONF neutron url "${Q_PROTOCOL}://$Q_HOST:$Q_PORT"
|
||||
|
||||
if [[ "$Q_USE_SECGROUP" == "True" ]]; then
|
||||
LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver
|
||||
|
|
Loading…
Reference in New Issue