openstack/devstack
Code Issues Proposed changes

Merge "Remove the EBTABLES_RACE_FIX added for Trusty"

Browse Source
This commit is contained in:
Jenkins 2017-04-07 00:33:30 +00:00 committed by Gerrit Code Review
commit ec60d050f5
4 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
files/ebtables.workaround
View File

@ -1,23 +0,0 @@
#!/bin/bash
#
# Copyright 2015 Hewlett-Packard Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
#
# This is a terrible, terrible, truly terrible work around for
# environments that have libvirt < 1.2.11. ebtables requires that you
# specifically tell it you would like to not race and get punched in
# the face when 2 run at the same time with a --concurrent flag.
flock -w 300 /var/lock/ebtables.nova /sbin/ebtables.real $@

5
lib/nova_plugins/functions-libvirt
View File

@ -64,11 +64,6 @@ function install_libvirt {
install_package qemu-system install_package qemu-system
install_package libvirt-bin libvirt-dev install_package libvirt-bin libvirt-dev
pip_install_gr libvirt-python pip_install_gr libvirt-python
if [[ ${DISTRO} == "trusty" && ${EBTABLES_RACE_FIX} == "True" ]]; then
# Work around for bug #1501558. We can remove this once we
# get to a version of Ubuntu that has new enough libvirt.
TOP_DIR=$TOP_DIR $TOP_DIR/tools/install_ebtables_workaround.sh
fi
#pip_install_gr <there-si-no-guestfs-in-pypi> #pip_install_gr <there-si-no-guestfs-in-pypi>
elif is_fedora || is_suse; then elif is_fedora || is_suse; then
# On "KVM for IBM z Systems", kvm does not have its own package # On "KVM for IBM z Systems", kvm does not have its own package

11
stackrc
View File

@ -845,17 +845,6 @@ USE_SSL=$(trueorfalse False USE_SSL)
# sharing the same database. It would be useful for multinode Grenade tests. # sharing the same database. It would be useful for multinode Grenade tests.
RECREATE_KEYSTONE_DB=$(trueorfalse True RECREATE_KEYSTONE_DB) RECREATE_KEYSTONE_DB=$(trueorfalse True RECREATE_KEYSTONE_DB)
# ebtables is inherently racey. If you run it by two or more processes
# simultaneously it will collide, badly, in the kernel and produce
# failures or corruption of ebtables. The only way around it is for
# all tools running ebtables to only ever do so with the --concurrent
# flag. This requires libvirt >= 1.2.11.
#
# If you don't have this then the following work around will replace
# ebtables with a wrapper script so that it is safe to run without
# that flag.
EBTABLES_RACE_FIX=$(trueorfalse False EBTABLES_RACE_FIX)
# Following entries need to be last items in file # Following entries need to be last items in file
# Compatibility bits required by other callers like Grenade # Compatibility bits required by other callers like Grenade

31
tools/install_ebtables_workaround.sh
View File

@ -1,31 +0,0 @@
#!/bin/bash -eu
#
# Copyright 2015 Hewlett-Packard Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
#
# This replaces the ebtables on your system with a wrapper script that
# does implicit locking. This is needed if libvirt < 1.2.11 on your platform.
EBTABLES=/sbin/ebtables
EBTABLESREAL=/sbin/ebtables.real
FILES=$TOP_DIR/files
if [[ -f "$EBTABLES" ]]; then
if file $EBTABLES | grep ELF; then
sudo mv $EBTABLES $EBTABLESREAL
sudo install -m 0755 $FILES/ebtables.workaround $EBTABLES
echo "Replaced ebtables with locking workaround"
fi
fi