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 | |
| parent | 35c0a05bffbd828a3830bc6e42a6e9ee1ebb8b4c (diff) | |
| parent | 095fbd7d7c07984141bda1d31779a3b046c6be90 (diff) | |
| download | kolla-c404151a3e7215fc909b0755ef1eb88e91f28b81.tar.gz kolla-c404151a3e7215fc909b0755ef1eb88e91f28b81.zip | |
Merge "Neutron doa in current form"
6 files changed, 7 insertions, 7 deletions
diff --git a/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh b/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh index 6149fc09e..415644aa6 100755 --- a/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh +++ b/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh @@ -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" diff --git a/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh b/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh index e735e4abe..5f88869d2 100755 --- a/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh +++ b/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh @@ -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 \ diff --git a/docker/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh b/docker/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh index 27a25cd61..568888d2c 100755 --- a/docker/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh +++ b/docker/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh @@ -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 \ diff --git a/docker/neutron/neutron-base/config-neutron.sh b/docker/neutron/neutron-base/config-neutron.sh index 18f5ffc96..35ce787a4 100644 --- a/docker/neutron/neutron-base/config-neutron.sh +++ b/docker/neutron/neutron-base/config-neutron.sh @@ -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" diff --git a/docker/neutron/neutron-server/start.sh b/docker/neutron/neutron-server/start.sh index 23ff63a87..d07328937 100755 --- a/docker/neutron/neutron-server/start.sh +++ b/docker/neutron/neutron-server/start.sh @@ -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 \ 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 |