Skip to content

Macvlan mode #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kvaps wants to merge 2 commits into from
Closed

Macvlan mode #221

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cccb7e2
add: macvlan mode
kvaps Oct 24, 2017
c02aaa3
fix: syntax
kvaps Oct 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions pipework
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ case "$1" in
DIRECT_PHYS=1
shift
;;
--macvlan-mode)
MACVLAN_MODE=1
shift
;;
esac

IFNAME=$1
Expand Down Expand Up @@ -153,8 +157,8 @@ CONTAINER_IFNAME=${CONTAINER_IFNAME:-eth1}
exit 0
}

[ "$IFTYPE" = bridge ] && [ "$BRTYPE" = linux ] && [ "$VLAN" ] && {
die 1 "VLAN configuration currently unsupported for Linux bridge."
[ "$IFTYPE" = bridge ] && [ "$BRTYPE" = linux ] && [ "$VLAN" ] && [ -z "$MACVLAN_MODE" ] && {
die 1 "VLAN configuration currently unsupported for Linux bridge. Try --macvlan-mode."
}

[ "$IFTYPE" = ipoib ] && [ "$MACADDR" ] && {
Expand Down Expand Up @@ -292,7 +296,7 @@ ln -s "/proc/$NSPID/ns/net" "/var/run/netns/$NSPID"
[ "$IFTYPE" != "route" ] && [ "$IFTYPE" != "dummy" ] && [ "$IFTYPE" != "rule" ] && [ "$IFTYPE" != "tc" ] && MTU=$(ip link show "$IFNAME" | awk '{print $5}')

# If it's a bridge, we need to create a veth pair
[ "$IFTYPE" = bridge ] && {
[ "$IFTYPE" = bridge ] && [ -z "$MACVLAN_MODE" ] && {
if [ -z "$LOCAL_IFNAME" ]; then
LOCAL_IFNAME="v${CONTAINER_IFNAME}pl${NSPID}"
fi
Expand Down Expand Up @@ -329,7 +333,7 @@ ln -s "/proc/$NSPID/ns/net" "/var/run/netns/$NSPID"
}

# If it's a physical interface, create a macvlan subinterface
[ "$IFTYPE" = phys ] && {
[ "$IFTYPE" = phys ] || ( [ "$IFTYPE" = bridge ] && [ ! -z "$MACVLAN_MODE" ] ) && {
[ "$VLAN" ] && {
[ ! -d "/sys/class/net/${IFNAME}.${VLAN}" ] && {
ip link add link "$IFNAME" name "$IFNAME.$VLAN" mtu "$MTU" type vlan id "$VLAN"
Expand Down