diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-13 16:55:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-13 16:55:40 +0000 |
| commit | fa789ab8babfd2612289a1e2b0bd00bbbc80a440 (patch) | |
| tree | 743bf5f35982f57ee6768bb44db027f39b11faee /docker/nova-base | |
| parent | 1a7c3e67a2047f0a7c789fe2471b5d65825fb9e1 (diff) | |
| parent | ed107a5e26f35351a178c12eed5cd38c086409db (diff) | |
| download | kolla-fa789ab8babfd2612289a1e2b0bd00bbbc80a440.tar.gz kolla-fa789ab8babfd2612289a1e2b0bd00bbbc80a440.zip | |
Merge "Adds Neutron Agents Support"
Diffstat (limited to 'docker/nova-base')
| -rwxr-xr-x | docker/nova-base/config-nova.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index 0b1dc39d3..f8a9c44a5 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -90,7 +90,11 @@ elif [ "${NETWORK_MANAGER}" == "neutron" ] ; then crudini --set $cfg DEFAULT neutron_default_tenant_id default crudini --set $cfg DEFAULT network_api_class nova.network.neutronv2.api.API crudini --set $cfg DEFAULT security_group_api neutron - crudini --set $cfg DEFAULT linuxnet_interface_driver nova.network.linux_net.NeutronLinuxBridgeInterfaceDriver + if [[ "${MECHANISM_DRIVERS}" =~ .*linuxbridge* ]] ; then + crudini --set $cfg DEFAULT linuxnet_interface_driver nova.network.linux_net.NeutronLinuxBridgeInterfaceDriver + elif [[ "${MECHANISM_DRIVERS}" =~ .*openvswitch* ]] ; then + crudini --set $cfg DEFAULT linuxnet_interface_driver nova.network.linux_net.LinuxOVSInterfaceDriver + fi crudini --set $cfg DEFAULT libvirt_vif_driver nova.virt.libvirt.vif.LibvirtGenericVIFDriver crudini --set $cfg DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver crudini --set $cfg neutron url http://${NEUTRON_SERVER_SERVICE_HOST}:${NEUTRON_SERVER_SERVICE_PORT} |