aboutsummaryrefslogtreecommitdiff
path: root/docker/nova-base
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-04-14 17:44:02 -0700
committerSteven Dake <stdake@cisco.com>2015-04-14 18:55:48 -0700
commit095fbd7d7c07984141bda1d31779a3b046c6be90 (patch)
treed343f993787a9647b11552c62b20ed38cc13f82e /docker/nova-base
parent4999b0cb5347b916ea99bceb2d32a3a89a0ddcc2 (diff)
downloadkolla-095fbd7d7c07984141bda1d31779a3b046c6be90.tar.gz
kolla-095fbd7d7c07984141bda1d31779a3b046c6be90.zip
Neutron doa in current form
The nova-config.sh script was exiting because of incorrect shell syntax. The correct syntax for a regex search is [[ haystack =~ needle ]]. The .*needle.* is unnecessary. I think this shell script exited because a period was missing. Change-Id: I3aca5e0729eb5fedbe9ecb4d75ed85d5a1c7815a
Diffstat (limited to 'docker/nova-base')
-rwxr-xr-xdocker/nova-base/config-nova.sh4
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