The CNI plugin implements this internally, and was never passing an
8th arg to the script.
| ... | ... |
@@ -10,7 +10,6 @@ ipaddr=$4 |
| 10 | 10 |
tenant_id=$5 |
| 11 | 11 |
ingress_bw=$6 |
| 12 | 12 |
egress_bw=$7 |
| 13 |
-macvlan=$8 |
|
| 14 | 13 |
|
| 15 | 14 |
lockwrap() {
|
| 16 | 15 |
( |
| ... | ... |
@@ -81,24 +80,11 @@ del_ovs_flows() {
|
| 81 | 81 |
fi |
| 82 | 82 |
} |
| 83 | 83 |
|
| 84 |
-add_macvlan() {
|
|
| 85 |
- default_dev=$(ip route show | sed -ne 's/^default .* dev \([^ ]*\) .*/\1/p') |
|
| 86 |
- if [ -z "$default_dev" ]; then |
|
| 87 |
- echo "Could not find default network interface" |
|
| 88 |
- exit 1 |
|
| 89 |
- fi |
|
| 90 |
- ip link add link $default_dev name macvlan0 type macvlan mode private |
|
| 91 |
- ip link set macvlan0 netns $pid |
|
| 92 |
-} |
|
| 93 |
- |
|
| 94 | 84 |
run() {
|
| 95 | 85 |
case "$action" in |
| 96 | 86 |
setup) |
| 97 | 87 |
add_ovs_port |
| 98 | 88 |
add_ovs_flows |
| 99 |
- if [ "$macvlan" = true ]; then |
|
| 100 |
- add_macvlan |
|
| 101 |
- fi |
|
| 102 | 89 |
;; |
| 103 | 90 |
|
| 104 | 91 |
update) |