summaryrefslogtreecommitdiffstats
path: root/lib/container
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-10-06 10:38:14 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-10-13 12:58:03 +0000
commit762fabf024e182020597a4c68636625da66b2ac0 (patch)
tree12107e839830b84224c9922ab5d73f4eceb30eff /lib/container
parentUsing iproute instead of bridge-utils to setup bridges. (diff)
downloadcompute-tools-762fabf024e182020597a4c68636625da66b2ac0.tar.xz
compute-tools-762fabf024e182020597a4c68636625da66b2ac0.zip
Removing some dead code in network-veth-extra handling.
This stuff is redundant when using bridges, and not using bridges has never worked anyway, hence removing it. Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to 'lib/container')
-rwxr-xr-xlib/container/start15
-rwxr-xr-xlib/container/stop6
2 files changed, 7 insertions, 14 deletions
diff --git a/lib/container/start b/lib/container/start
index 13621ff..566b4b0 100755
--- a/lib/container/start
+++ b/lib/container/start
@@ -295,15 +295,16 @@ then
MACHINE="--machine=${NAME}"
- NETWORK_VETH_EXTRA_CONF="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
NETWORK_VETH_EXTRA=""
- case "${NETWORK_VETH_EXTRA_CONF}" in
+ VETHS="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+
+ case "${VETHS}" in
"")
;;
*)
- for VETH in ${NETWORK_VETH_EXTRA_CONF}
+ for VETH in ${VETHS}
do
NETWORK_VETH_EXTRA="${NETWORK_VETH_EXTRA} --network-veth-extra=${VETH}"
INTERFACE="$(echo ${VETH} | awk -F: '{ print $1 }')"
@@ -312,14 +313,6 @@ then
then
echo "'${INTERFACE}': name exceeds maximum of 15 characters, network might be not working."
fi
-
-cat > "/etc/network/interfaces.d/${INTERFACE}" << EOF
-allow-hotplug ${INTERFACE}
-iface ${INTERFACE} inet manual
- pre-up ip link set ${INTERFACE} up
- post-down ip link set ${INTERFACE} down
-EOF
-
done
;;
esac
diff --git a/lib/container/stop b/lib/container/stop
index 12cf7fa..6b1c986 100755
--- a/lib/container/stop
+++ b/lib/container/stop
@@ -176,14 +176,14 @@ case "${CLEAN}" in
fi
# Removing network configuration
- NETWORK_VETH_EXTRA_CONF="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+ VETHS="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
- case "${NETWORK_VETH_EXTRA_CONF}" in
+ case "${VETHS}" in
"")
;;
*)
- for VETH in ${NETWORK_VETH_EXTRA_CONF}
+ for VETH in ${VETHS}
do
INTERFACE="$(echo ${VETH} | awk -F: '{ print $1 }')"
FILE="/etc/network/interfaces.d/${INTERFACE}"