summaryrefslogtreecommitdiffstats
path: root/libexec/container
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-06-30 06:54:24 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-06-30 06:54:53 +0000
commitd6fea0bc206f5785fb457d15c2ebee9212d07993 (patch)
treeb286e6d22ebb6b8411ea2763739c9146ae83aeff /libexec/container
parentReleasing version 20210629. (diff)
downloadcompute-tools-d6fea0bc206f5785fb457d15c2ebee9212d07993.tar.xz
compute-tools-d6fea0bc206f5785fb457d15c2ebee9212d07993.zip
Reverting openvswitch, not really ready yet.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to 'libexec/container')
-rwxr-xr-xlibexec/container/start68
-rwxr-xr-xlibexec/container/stop6
2 files changed, 36 insertions, 38 deletions
diff --git a/libexec/container/start b/libexec/container/start
index 6b35ea8..08c3611 100755
--- a/libexec/container/start
+++ b/libexec/container/start
@@ -367,6 +367,42 @@ then
;;
esac
+ NETWORK_BRIDGES="$(awk -Fcnt.network-bridge= '/^cnt.network-bridge=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+
+ case "${NETWORK_BRIDGES}" in
+ "")
+ ;;
+
+ *)
+ for BRIDGE_DEFINITION in ${NETWORK_BRIDGES}
+ do
+ INTERFACE="$(echo ${BRIDGE_DEFINITION} | awk -F: '{ print $1 }')"
+ BRIDGE="$(echo ${BRIDGE_DEFINITION} | awk -F: '{ print $2 }')"
+
+ if [ "$(echo ${INTERFACE} | wc -c)" -gt 15 ]
+ then
+ echo "'${INTERFACE}': name exceeds maximum of 15 characters, network might be not working."
+ fi
+
+ if [ -n "${BRIDGE}" ] && [ -n "${INTERFACE}" ]
+ then
+
+cat > "/etc/network/interfaces.d/${INTERFACE}" << EOF
+allow-hotplug ${INTERFACE}
+iface ${INTERFACE} inet manual
+ pre-up ip link set ${INTERFACE} up
+ post-up ip link set ${INTERFACE} master ${BRIDGE}
+ pre-down ip link set ${INTERFACE} nomaster
+ post-down ip link set ${INTERFACE} down
+EOF
+
+ else
+ echo "Warning bridge definition '${BRIDGE_DEFINITION}' not recognized (expected <bridge>:<interface>): Ignoring"
+ fi
+ done
+ ;;
+ esac
+
PRIVATE_USERS="$(awk -Fprivate-users= '/^private-users=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo no)"
case "${PRIVATE_USERS}" in
@@ -500,35 +536,3 @@ case "${START}" in
esac
;;
esac
-
-# waiting for systemd-nspawn to create the veth interfaces
-sleep 1
-NETWORK_BRIDGES="$(awk -Fcnt.network-bridge= '/^cnt.network-bridge=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
-
-case "${NETWORK_BRIDGES}" in
- "")
- ;;
-
- *)
- for BRIDGE_DEFINITION in ${NETWORK_BRIDGES}
- do
- INTERFACE="$(echo ${BRIDGE_DEFINITION} | awk -F: '{ print $1 }')"
- BRIDGE="$(echo ${BRIDGE_DEFINITION} | awk -F: '{ print $2 }')"
-
- if [ "$(echo ${INTERFACE} | wc -c)" -gt 15 ]
- then
- echo "'${INTERFACE}': name exceeds maximum of 15 characters, network might be not working."
- fi
-
- if [ -n "${BRIDGE}" ] && [ -n "${INTERFACE}" ]
- then
-
- ip link set "${INTERFACE}" up
- ovs-vsctl --may-exist add-port "${BRIDGE}" "${INTERFACE}"
-
- else
- echo "Warning bridge definition '${BRIDGE_DEFINITION}' not recognized (expected <bridge>:<interface>): Ignoring"
- fi
- done
- ;;
-esac
diff --git a/libexec/container/stop b/libexec/container/stop
index 52b40d1..58fc0e9 100755
--- a/libexec/container/stop
+++ b/libexec/container/stop
@@ -261,12 +261,6 @@ case "${VERBOSE}" in
;;
esac
-VETHS="$(awk -Fnetwork-veth-extra= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf | awk -F: '{ print $1 }')"
-for VETH in ${VETHS}
-do
- ovs-vsctl --if-exist del-port "${VETH}"
-done
-
machinectl ${MODE} ${NAME}
case "${FORCE}" in