Revision 263fe009
b/common.sh | ||
---|---|---|
362 | 362 |
|
363 | 363 |
} |
364 | 364 |
|
365 |
get_instance_info () { |
|
366 |
|
|
367 |
if [ -z "$GANETI_INSTANCE_NAME" -a -n "$INSTANCE" ]; then |
|
368 |
GANETI_INSTANCE_NAME=$INSTANCE |
|
369 |
fi |
|
370 |
|
|
371 |
} |
|
372 |
|
|
373 |
get_mode_info () { |
|
374 |
|
|
375 |
local iface=$1 |
|
376 |
local mode=$2 |
|
377 |
local link=$3 |
|
378 |
|
|
379 |
TABLE= |
|
380 |
INDEV= |
|
381 |
|
|
382 |
if [ "$mode" = "routed" ]; then |
|
383 |
TABLE=$link |
|
384 |
INDEV=$iface |
|
385 |
elif [ "$mode" = "bridged" ]; then |
|
386 |
INDEV=$link |
|
387 |
fi |
|
388 |
|
|
389 |
} |
|
390 |
|
|
365 | 391 |
|
366 | 392 |
# Use environment variables to calculate desired info |
367 | 393 |
# IP, MAC, LINK, TABLE, BRIDGE, |
... | ... | |
369 | 395 |
function get_info { |
370 | 396 |
|
371 | 397 |
$SNF_NETWORK_LOG $0 "Getting info for $INTERFACE of $GANETI_INSTANCE_NAME" |
398 |
get_instance_info |
|
399 |
get_mode_info $INTERFACE $MODE $LINK |
|
372 | 400 |
get_ebtables_chains $INTERFACE |
373 | 401 |
get_rev4_info $IP |
374 | 402 |
get_eui64 $MAC $NETWORK_SUBNET6 |
b/kvm-ifdown-custom | ||
---|---|---|
6 | 6 |
source /etc/default/snf-network |
7 | 7 |
source /usr/lib/snf-network/common.sh |
8 | 8 |
|
9 |
GANETI_INSTANCE_NAME=$INSTANCE |
|
10 | 9 |
get_info |
11 | 10 |
|
12 | 11 |
if [ "$MODE" = "routed" ]; then |
13 |
TABLE=$LINK |
|
14 |
INDEV=$INTERFACE |
|
12 |
:; |
|
15 | 13 |
elif [ "$MODE" = "bridged" ]; then |
16 | 14 |
brctl delif $BRIDGE $INTERFACE |
17 |
INDEV=$BRIDGE |
|
18 | 15 |
fi |
19 | 16 |
|
20 | 17 |
|
b/kvm-ifup-custom | ||
---|---|---|
6 | 6 |
source /etc/default/snf-network |
7 | 7 |
source /usr/lib/snf-network/common.sh |
8 | 8 |
|
9 |
GANETI_INSTANCE_NAME=$INSTANCE |
|
10 | 9 |
get_info |
11 | 10 |
|
12 | 11 |
try clear_routed_setup_ipv4 |
... | ... | |
16 | 15 |
try clear_nfdhcpd |
17 | 16 |
|
18 | 17 |
if [ "$MODE" = "routed" ]; then |
19 |
TABLE=$LINK |
|
20 | 18 |
ip link set $INTERFACE addr $TAP_CONSTANT_MAC up |
21 |
INDEV=$INTERFACE |
|
22 | 19 |
elif [ "$MODE" = "bridged" ]; then |
23 | 20 |
ip link set $INTERFACE up |
24 | 21 |
brctl addif $BRIDGE $INTERFACE |
25 |
INDEV=$BRIDGE |
|
26 | 22 |
fi |
27 | 23 |
|
28 | 24 |
for tag in $NETWORK_TAGS; do |
b/vif-custom | ||
---|---|---|
18 | 18 |
INTERFACE=$dev |
19 | 19 |
INSTANCE=$domname |
20 | 20 |
|
21 |
GANETI_INSTANCE_NAME=$INSTANCE |
|
22 | 21 |
get_info |
23 | 22 |
|
24 | 23 |
try clear_routed_setup_ipv4 |
... | ... | |
28 | 27 |
try clear_nfdhcpd |
29 | 28 |
|
30 | 29 |
if [ "$MODE" = "routed" ]; then |
31 |
TABLE=$LINK |
|
32 | 30 |
ip link set $INTERFACE up |
33 | 31 |
success |
34 |
INDEV=$INTERFACE |
|
35 | 32 |
elif [ "$MODE" = "bridged" ]; then |
36 | 33 |
ip link set $INTERFACE up |
37 | 34 |
BRIDGE=$(xenstore_read_default "$XENBUS_PATH/bridge" "$LINK") |
38 | 35 |
brctl addif $BRIDGE $INTERFACE |
39 | 36 |
success |
40 |
INDEV=$BRIDGE |
|
41 | 37 |
fi |
42 | 38 |
|
43 | 39 |
for tag in $NETWORK_TAGS; do |
Also available in: Unified diff