diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-17 20:16:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-17 20:16:06 +0000 |
| commit | c404151a3e7215fc909b0755ef1eb88e91f28b81 (patch) | |
| tree | 4e307eb2febf3c3b49c77fb0287d7d2cbbdeaed6 /docker/nova-base | |
| parent | 35c0a05bffbd828a3830bc6e42a6e9ee1ebb8b4c (diff) | |
| parent | 095fbd7d7c07984141bda1d31779a3b046c6be90 (diff) | |
| download | kolla-c404151a3e7215fc909b0755ef1eb88e91f28b81.tar.gz kolla-c404151a3e7215fc909b0755ef1eb88e91f28b81.zip | |
Merge "Neutron doa in current form"
Diffstat (limited to 'docker/nova-base')
| -rwxr-xr-x | docker/nova-base/config-nova.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index 2912d0b58..00365f1ad 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -90,9 +90,9 @@ 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 - if [[ "${MECHANISM_DRIVERS}" =~ .*linuxbridge* ]] ; then + if [[ "${MECHANISM_DRIVERS}" =~ linuxbridge ]] ; then crudini --set $cfg DEFAULT linuxnet_interface_driver nova.network.linux_net.NeutronLinuxBridgeInterfaceDriver - elif [[ "${MECHANISM_DRIVERS}" =~ .*openvswitch* ]] ; then + 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 |