Browse code
Merge "Devstack Nuage Plugin correct the ovs_bridge parameter"
Jenkins authored on 2014/11/14 01:55:38Showing 1 changed files
| ... | ... |
@@ -7,7 +7,7 @@ set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
function neutron_plugin_create_nova_conf {
|
| 9 | 9 |
NOVA_OVS_BRIDGE=${NOVA_OVS_BRIDGE:-"br-int"}
|
| 10 |
- iniset $NOVA_CONF DEFAULT neutron_ovs_bridge $NOVA_OVS_BRIDGE |
|
| 10 |
+ iniset $NOVA_CONF neutron ovs_bridge $NOVA_OVS_BRIDGE |
|
| 11 | 11 |
NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
| 12 | 12 |
LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver |
| 13 | 13 |
iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER |