openstack/tripleo-image-elements
Code Issues Proposed changes

Merge "Work around leak in dhcp-all-interfaces udev rule"

Browse Source
This commit is contained in:
Jenkins 2016-03-31 21:01:09 +00:00 committed by Gerrit Code Review
commit cd7fe85b82
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
elements/os-net-config/os-refresh-config/configure.d/20-os-net-config
View File

@ -104,6 +104,15 @@ if [ -n "$NET_CONFIG" ]; then
RETVAL=$? RETVAL=$?
if [[ $RETVAL == 2 ]]; then if [[ $RETVAL == 2 ]]; then
ping_metadata_ip ping_metadata_ip
#NOTE: dprince this udev rule can apparently leak DHCP processes?
# https://bugs.launchpad.net/tripleo/+bug/1538259
# until we discover the root cause we can simply disable the
# rule because networking has already been configured at this point
if [ -f /etc/udev/rules.d/99-dhcp-all-interfaces.rules ]; then
rm /etc/udev/rules.d/99-dhcp-all-interfaces.rules
fi
elif [[ $RETVAL != 0 ]]; then elif [[ $RETVAL != 0 ]]; then
echo "ERROR: os-net-config configuration failed." >&2 echo "ERROR: os-net-config configuration failed." >&2
exit 1 exit 1