Commit 4855760b authored by Dimitris Aragiorgis's avatar Dimitris Aragiorgis Committed by Thomas Thrainer

Refactor NIC configuration scripts

Add new script vif-ganeti that could be used instead of
default vif-bridge in order NIC customization can be more
flexible.

Extract common code from kvm-ifup and insert it in a new
file net-common that is being sourced by kvm-ifup and
vif-ganeti and located under package lib dir (/usr/lib/ganeti/).

Install vif-ganeti properly with make under /usr/lib/ganeti too.
Signed-off-by: default avatarDimitris Aragiorgis <dimara@grnet.gr>
Signed-off-by: default avatarThomas Thrainer <thomasth@google.com>
Reviewed-by: default avatarThomas Thrainer <thomasth@google.com>
parent 397b7844
......@@ -104,6 +104,8 @@
/tools/ensure-dirs
/tools/users-setup
/tools/vcluster-setup
/tools/vif-ganeti
/tools/net-common
/tools/node-cleanup
/tools/node-daemon-setup
/tools/prepare-node-join
......
......@@ -197,6 +197,8 @@ CLEANFILES = \
$(man_MANS) \
$(manhtml) \
tools/kvm-ifup \
tools/vif-ganeti \
tools/net-common \
tools/users-setup \
tools/vcluster-setup \
stamp-directories \
......@@ -938,6 +940,8 @@ nodist_pkglib_python_scripts = \
myexeclib_SCRIPTS = \
daemons/daemon-util \
tools/kvm-ifup \
tools/vif-ganeti \
tools/net-common \
$(pkglib_python_scripts) \
$(HS_MYEXECLIB_PROGS)
......@@ -973,6 +977,8 @@ EXTRA_DIST = \
devel/upload \
devel/webserver \
tools/kvm-ifup.in \
tools/vif-ganeti.in \
tools/net-common.in \
tools/users-setup.in \
tools/vcluster-setup.in \
$(docinput) \
......@@ -1395,6 +1401,14 @@ tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod +x $@
tools/vif-ganeti: tools/vif-ganeti.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod +x $@
tools/net-common: tools/net-common.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod +x $@
tools/users-setup: tools/users-setup.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod +x $@
......
......@@ -18,65 +18,14 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
@SHELL_ENV_INIT@
if [ -z "$INTERFACE" ]; then
echo "No network interface specified"
exit 1
fi
if [ -z "$MODE" ]; then
echo "MODE not specified"
exit 1
fi
source @PKGLIBDIR@/net-common
# Execute the user-supplied network script, if applicable
if [ -x "$CONF_DIR/kvm-vif-bridge" ]; then
exec $CONF_DIR/kvm-vif-bridge
fi
if [ "$MODE" = "bridged" ]; then
# Fix the autogenerated MAC to have the first octet set to "fe"
# to discourage the bridge from using the TAP dev's MAC
FIXED_MAC=$(ip link show $INTERFACE | \
awk '{if ($1 == "link/ether") printf("fe%s",substr($2,3,15))}')
ip link set $INTERFACE address $FIXED_MAC
ip link set $INTERFACE up
ip link set $INTERFACE mtu $(</sys/class/net/${BRIDGE}/mtu)
# Connect the interface to the bridge
brctl addif $BRIDGE $INTERFACE
elif [ "$MODE" = "openvswitch" ]; then
ovs-vsctl add-port ${LINK} $INTERFACE
else
ip link set $INTERFACE up
if [ -z "$IP" ]; then
echo "Routed NIC but no IP address specified"
exit 1
fi
# Route traffic targeted at the IP to the interface
if [ -n "$LINK" ]; then
while ip rule del dev $INTERFACE; do :; done
ip rule add dev $INTERFACE table $LINK
ip route replace $IP table $LINK proto static dev $INTERFACE
else
ip route replace $IP proto static dev $INTERFACE
fi
# Allow routing and arp proxying, or ndp proxying (IPv6)
if [ -d "/proc/sys/net/ipv4/conf/$INTERFACE" ]; then
echo 1 > /proc/sys/net/ipv4/conf/$INTERFACE/proxy_arp
echo 1 > /proc/sys/net/ipv4/conf/$INTERFACE/forwarding
fi
if [ -d "/proc/sys/net/ipv6/conf/$INTERFACE" ]; then
echo 1 > /proc/sys/net/ipv6/conf/$INTERFACE/proxy_ndp
echo 1 > /proc/sys/net/ipv6/conf/$INTERFACE/forwarding
fi
fi
check
setup_bridge
setup_ovs
setup_route
#!/bin/bash
#
# Copyright (C) 2011, 2012, 2013 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
@SHELL_ENV_INIT@
function check {
if [ -z "$INTERFACE" ]; then
echo "No network interface specified"
exit 1
fi
if [ -z "$MODE" ]; then
echo "MODE not specified"
exit 1
fi
}
function fix_mac {
# Fix the autogenerated MAC to have the first octet set to "fe"
# to discourage the bridge from using the TAP dev's MAC
FIXED_MAC=$(ip link show $INTERFACE | \
awk '{if ($1 == "link/ether") printf("fe%s",substr($2,3,15))}')
# in case of a vif (xen_netback device) this action is not allowed
ip link set $INTERFACE address $FIXED_MAC || true
}
function setup_bridge {
if [ "$MODE" = "bridged" ]; then
fix_mac
ip link set $INTERFACE up
ip link set $INTERFACE mtu $(</sys/class/net/${BRIDGE}/mtu)
# Connect the interface to the bridge
brctl addif $BRIDGE $INTERFACE
fi
}
function setup_ovs {
if [ "$MODE" = "openvswitch" ]; then
ovs-vsctl add-port ${LINK} $INTERFACE
fi
}
function setup_route {
if [ "$MODE" = "openvswitch" ]; then
ip link set $INTERFACE up
if [ -z "$IP" ]; then
echo "Routed NIC but no IP address specified"
exit 1
fi
# Route traffic targeted at the IP to the interface
if [ -n "$LINK" ]; then
while ip rule del dev $INTERFACE; do :; done
ip rule add dev $INTERFACE table $LINK
ip route replace $IP table $LINK proto static dev $INTERFACE
else
ip route replace $IP proto static dev $INTERFACE
fi
# Allow routing and arp proxying, or ndp proxying (IPv6)
if [ -d "/proc/sys/net/ipv4/conf/$INTERFACE" ]; then
echo 1 > /proc/sys/net/ipv4/conf/$INTERFACE/proxy_arp
echo 1 > /proc/sys/net/ipv4/conf/$INTERFACE/forwarding
fi
if [ -d "/proc/sys/net/ipv6/conf/$INTERFACE" ]; then
echo 1 > /proc/sys/net/ipv6/conf/$INTERFACE/proxy_ndp
echo 1 > /proc/sys/net/ipv6/conf/$INTERFACE/forwarding
fi
fi
}
#!/bin/bash
#
# Copyright (C) 2011, 2012, 2013 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
if [ -x "@XEN_CONFIG_DIR@/scripts/vif-custom" ]; then
exec @XEN_CONFIG_DIR@/scripts/vif-custom $*
fi
source @PKGLIBDIR@/net-common
dir=$(dirname "$0")
. "$dir"/vif-common.sh
# taken from older vif-common.sh
dev=$vif
dev_=${dev#vif}
domid=${dev_%.*}
devid=${dev_#*.}
domname=$(xm domname $domid)
NIC_DIR=$RUN_DIR/xen-hypervisor/nic
INTERFACE=$dev
INSTANCE=$domname
source $NIC_DIR/$domname/$devid
setup_bridge
setup_ovs
setup_route
success
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment