openstack/devstack
Code Issues Proposed changes

Only sysctl reserverd ports when available.

Browse Source 
Only set the keystone reserved ports when available, on some system
(like when running under containers) where this sysfs interface is not
exposed we are almost pretty sure these ports would be exclusive for our
devstack.

Change-Id: I06d7d227ae94d564c91c16119e4bbbcc6564a280
This commit is contained in:
Chmouel Boudjnah 2014-10-02 20:58:20 +02:00 committed by Cedric Brandily
parent f33e76bf9b
commit 8fceb49820
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/fixup_stuff.sh
View File

@ -50,17 +50,24 @@ fi
# exception into the Kernel for the Keystone AUTH ports. # exception into the Kernel for the Keystone AUTH ports.
keystone_ports=${KEYSTONE_AUTH_PORT:-35357},${KEYSTONE_AUTH_PORT_INT:-35358} keystone_ports=${KEYSTONE_AUTH_PORT:-35357},${KEYSTONE_AUTH_PORT_INT:-35358}
# Get any currently reserved ports, strip off leading whitespace # only do the reserved ports when available, on some system (like containers)
reserved_ports=$(sysctl net.ipv4.ip_local_reserved_ports | awk -F'=' '{print $2;}' | sed 's/^ //') # where it's not exposed we are almost pretty sure these ports would be
# exclusive for our devstack.
if sysctl net.ipv4.ip_local_reserved_ports >/dev/null 2>&1; then
# Get any currently reserved ports, strip off leading whitespace
reserved_ports=$(sysctl net.ipv4.ip_local_reserved_ports | awk -F'=' '{print $2;}' | sed 's/^ //')
if [[ -z "${reserved_ports}" ]]; then if [[ -z "${reserved_ports}" ]]; then
# If there are no currently reserved ports, reserve the keystone ports # If there are no currently reserved ports, reserve the keystone ports
sudo sysctl -w net.ipv4.ip_local_reserved_ports=${keystone_ports} sudo sysctl -w net.ipv4.ip_local_reserved_ports=${keystone_ports}
else else
# If there are currently reserved ports, keep those and also reserve the # If there are currently reserved ports, keep those and also reserve the
# keystone specific ports. Duplicate reservations are merged into a single # keystone specific ports. Duplicate reservations are merged into a single
# reservation (or range) automatically by the kernel. # reservation (or range) automatically by the kernel.
sudo sysctl -w net.ipv4.ip_local_reserved_ports=${keystone_ports},${reserved_ports} sudo sysctl -w net.ipv4.ip_local_reserved_ports=${keystone_ports},${reserved_ports}
fi
else
echo_summary "WARNING: unable to reserve keystone ports"
fi fi