openstack/kolla-ansible
Code Issues Proposed changes

Neutron doa in current form

Browse Source 
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
This commit is contained in:
Steven Dake 2015-04-14 17:44:02 -07:00
parent 4999b0cb53
commit 095fbd7d7c
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh
View File

@ -18,7 +18,7 @@ check_required_vars VERBOSE_LOGGING DEBUG_LOGGING MECHANISM_DRIVERS \
cfg=/etc/neutron/dhcp_agent.ini
neutron_conf=/etc/neutron/neutron.conf
if [[ ${MECHANISM_DRIVERS} =~ .*linuxbridge.* ]]; then
if [[ ${MECHANISM_DRIVERS} =~ linuxbridge ]]; then
interface_driver="neutron.agent.linux.interface.BridgeInterfaceDriver"
elif [[ ${MECHANISM_DRIVERS} == "openvswitch" ]]; then
interface_driver="neutron.agent.linux.interface.OVSInterfaceDriver"

2
docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh
View File

@ -27,7 +27,7 @@ crudini --set $cfg \
DEFAULT \
debug \
"${DEBUG_LOGGING}"
if [[ "${MECHANISM_DRIVERS}" =~ .*linuxbridge* ]] ; then
if [[ "${MECHANISM_DRIVERS}" =~ linuxbridge ]] ; then
crudini --set $cfg \
DEFAULT \
interface_driver \

2
docker/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh
View File

@ -14,7 +14,7 @@ check_required_vars PUBLIC_IP NEUTRON_FLAT_NETWORK_NAME \
cfg=/etc/neutron/plugins/ml2/ml2_conf.ini
# Configure ml2_conf.ini
if [[ ${TYPE_DRIVERS} =~ .*vxlan.* ]]; then
if [[ ${TYPE_DRIVERS} =~ vxlan ]]; then
crudini --set $cfg \
vxlan \
local_ip \

2
docker/neutron/neutron-base/config-neutron.sh
View File

@ -191,7 +191,7 @@ crudini --set $ml2_cfg \
enable_ipset \
"True"
if [[ ${MECHANISM_DRIVERS} =~ .*linuxbridge.* ]]; then
if [[ ${MECHANISM_DRIVERS} =~ linuxbridge ]]; then
firewall_driver="neutron.agent.linux.iptables_firewall.IptablesFirewallDriver"
elif [[ ${MECHANISM_DRIVERS} == "openvswitch" ]]; then
firewall_driver="neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver"

2
docker/neutron/neutron-server/start.sh
View File

@ -86,7 +86,7 @@ crudini --set $core_cfg \
nova_admin_password \
"${NOVA_KEYSTONE_PASSWORD}"
if [[ ${MECHANISM_DRIVERS} =~ .*linuxbridge.* ]]; then
if [[ ${MECHANISM_DRIVERS} =~ linuxbridge ]]; then
crudini --set $ml2_cfg \
linux_bridge \
physical_interface_mappings \

4
docker/nova-base/config-nova.sh
View File

@ -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