summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-04-30 22:10:58 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-04-30 22:10:58 +0000
commit5e8cdc8f88a9b9684cc6dc02b1d04ad52d966fe4 (patch)
tree196f1feb7861b71b41d0836231ff6dbc537cf371
parentAdding upstream version 20220428. (diff)
downloadopen-infrastructure-compute-tools-5e8cdc8f88a9b9684cc6dc02b1d04ad52d966fe4.tar.xz
open-infrastructure-compute-tools-5e8cdc8f88a9b9684cc6dc02b1d04ad52d966fe4.zip
Adding upstream version 20220430.upstream/20220430
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--CHANGELOG.txt11
-rw-r--r--VERSION.txt2
-rwxr-xr-xlibexec/container/enter2
-rwxr-xr-xlibexec/container/list2
-rw-r--r--share/doc/host-setup.txt170
5 files changed, 91 insertions, 96 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6c6db18..615934c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,14 @@
+2022-04-30 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+ * Releasing version 20220430.
+
+ [ Simon Spöhel ]
+ * Updating documentation for systemd-networkd.
+
+ [ Daniel Baumann ]
+ * Actually passing through SSH_CLIENT variable to enable powerline-prompt in container enter command.
+ * Listing all IP addresses in container list command.
+
2022-04-28 Daniel Baumann <daniel.baumann@open-infrastructure.net>
* Releasing version 20220428.
diff --git a/VERSION.txt b/VERSION.txt
index 04ee20d..bbfd1ea 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20220428
+20220430
diff --git a/libexec/container/enter b/libexec/container/enter
index 604d714..f1dae7f 100755
--- a/libexec/container/enter
+++ b/libexec/container/enter
@@ -111,7 +111,7 @@ done
SSH_CLIENT="${SSH_CLIENT:-127.0.0.1 0 0}"
# Run
-nsenter --all --target "${LEADER}" --wd="${MACHINES}/${NAME}/root" /usr/bin/script -c "LC_ALL=C.UTF-8 /bin/bash -l" -q /dev/null
+nsenter --all --target "${LEADER}" --wd="${MACHINES}/${NAME}/root" /usr/bin/script -c "LC_ALL=C.UTF-8 SSH_CLIENT=\"${SSH_CLIENT}\" /bin/bash -l" -q /dev/null
case "${SSH_CLIENT}" in
127.0.0.1*)
diff --git a/libexec/container/list b/libexec/container/list
index c112cc8..2600bab 100755
--- a/libexec/container/list
+++ b/libexec/container/list
@@ -377,7 +377,7 @@ do
*)
LEADER="$(machinectl status ${CONTAINER} | awk '/Leader: / { print $2 }')"
- ADDRESS="$(nsenter --all --target "${LEADER}" /bin/hostname -I | sed -e 's|\r$||' | awk '{ print $1 }')"
+ ADDRESS="$(nsenter --all --target "${LEADER}" /bin/hostname -I)"
;;
esac
diff --git a/share/doc/host-setup.txt b/share/doc/host-setup.txt
index 9a9ec94..b6da7f0 100644
--- a/share/doc/host-setup.txt
+++ b/share/doc/host-setup.txt
@@ -5,7 +5,7 @@ compute-tools: Host Setup
1. Debian Packages
-------------------
-apt install bridge-utils ifenslave vlan
+apt install systemd-networkd
2. Boot Parameters
@@ -45,126 +45,110 @@ parameter (see #881813 for more information):
3.1.1 Bridge: 1 Interface, standalone, DHCP
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-cat > /etc/network/interfaces << EOF
-# /etc/network/interfaces
-
-source /etc/network/interfaces.d/*
-
-auto lo
-iface lo inet loopback
+cat > /etc/systemd/network/bridge0.netdev << EOF
+[NetDev]
+Name=bridge0
+Kind=bridge
+EOF
-iface eno1 inet manual
+cat > /etc/systemd/network/bridge0.network << EOF
+[Match]
+Name=bridge-0
-auto bridge0
-iface bridge0 inet dhcp
- bridge_ports eno1
- bridge_fd 0
- bridge_maxwait 0
- bridge_stp 0
+[Network]
+DHCP=yes
EOF
3.1.2 Bridge: 1 Interface, standalone, static
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-cat > /etc/network/interfaces << EOF
-# /etc/network/interfaces
-
-source /etc/network/interfaces.d/*
-
-auto lo
-iface lo inet loopback
-
-iface eno1 inet manual
-
-auto bridge0
-iface bridge0 inet static
- address 10.0.0.2
- gateway 10.0.0.1
- netmask 24
-
- pre-up ip link set eno1 down
- pre-up ip link set eno1 up
-
- bridge_ports eno1
- bridge_fd 0
- bridge_maxwait 0
- bridge_stp 0
+cat > /etc/systemd/network/bridge0.netdev << EOF
+[NetDev]
+Name=bridge0
+Kind=bridge
EOF
+cat > /etc/systemd/network/bridge0.network << EOF
+[Match]
+Name=bridge-0
-3.1.3 Bridge: 2 logical Interfaces, subnet, static
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-cat > /etc/network/interfaces << EOF
-# /etc/network/interfaces
-
-source /etc/network/interfaces.d/*
-
-auto lo
-iface lo inet loopback
+[Network]
+Address=10.0.0.2/24
+Gateway=10.0.0.1
+EOF
-allow-hotplug eno1
-iface eno1 inet dhcp
-auto bridge0
-iface bridge0 inet static
- address 10.0.0.1
- netmask 24
+3.1.3 Bridge: 3 physical Interfaces, vlan, bonding, static
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- pre-up ip link add name bridge0 type bridge
- post-down ip link delete bridge0 type bridge
+cat > /etc/systemd/network/eno2.network<< EOF
+[Match]
+Name=eno2
- bridge_fd 0
- bridge_maxwait 0
- bridge_stp 0
+[Network]
+Bond=bond0
EOF
+cat > /etc/systemd/network/eno3.network<< EOF
+[Match]
+Name=eno3
-3.1.4 Bridge: 3 physical Interfaces, vlan, bonding, static
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-cat > /etc/network/interfaces << EOF
-# /etc/network/interfaces
-
-source /etc/network/interfaces.d/*
+[Network]
+Bond=bond0
+EOF
-auto lo
-iface lo inet loopback
+cat > /etc/systemd/network/bond0.netdev << EOF
+[NetDev]
+Name=bond0
+Kind=bond
+
+[Bond]
+Mode=802.3ad
+TransmitHashPolicy=layer3+4
+MIIMonitorSec=0.1
+UpDelaySec=0.2
+DownDelaySec=0.2
+EOF
-allow-hotplug eno1
-iface eno1 inet dhcp
+cat > /etc/systemd/network/bond0.network << EOF
+[Match]
+Name=bond0
-iface eno2 inet manual
+[Network]
+VLAN=100
+EOF
-iface eno3 inet manual
+cat > /etc/systemd/network/vlan-100.netdev << EOF
+[NetDev]
+Name=vlan-100
+Kind=vlan
-auto bond0
-iface bond0 inet manual
- up ip link set bond0 up
- down ip link set bond0 down
+[VLAN]
+Id=100
+EOF
- slaves eno2 eno3
+cat > /etc/systemd/network/vlan-100.netdev << EOF
+[Match]
+Name=vlan-100
- bond-mode 4
- bond-miimon 100
- bond-downdelay 200
- bond-updelay 200
- bond-lacp-rate 1
- bond-xmit-hash-policy layer2+3
+[Network]
+Bridge=bridge-100
+EOF
-iface bond0.100 inet manual
- vlan-raw-device bond0
+cat > /etc/systemd/network/bridge-100.netdev << EOF
+[NetDev]
+Name=bridge-100
+Kind=bridge
+EOF
-auto bridge-100
-iface bridge-100 inet static
- address 10.100.0.2
- netmask 24
+cat > /etc/systemd/network/bridge-100.network << EOF
+[Match]
+Name=bridge-100
- bridge_ports bond0.100
- bridge_fd 0
- bridge_maxwait 0
- bridge_stp 0
+[Network]
+Address=10.100.0.2/24
+Gateway=10.100.0.1
EOF