From 095fbd7d7c07984141bda1d31779a3b046c6be90 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 14 Apr 2015 17:44:02 -0700 Subject: 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 --- docker/nova-base/config-nova.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/nova-base') 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 -- cgit v1.2.3