Merge pull request #451 from dtantsur/redfish-listen

sushy-tools: make listen interface customizable
metal3-io · Dec 7, 2023 · fb7e98d · fb7e98d
2 parents bea2325 + d7fbff4
commit fb7e98d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/resources/sushy-tools/Dockerfile b/resources/sushy-tools/Dockerfile
@@ -9,5 +9,6 @@ RUN apt-get update && \
     pip3 install --no-cache-dir \
         sushy-tools==${SUSHY_TOOLS_VERSION} libvirt-python
 
-CMD /usr/local/bin/sushy-emulator -i :: \
-        --config /root/sushy/conf.py --debug
+COPY redfish-emulator.sh /usr/local/bin/
+
+CMD /usr/local/bin/redfish-emulator.sh
diff --git a/resources/sushy-tools/redfish-emulator.sh b/resources/sushy-tools/redfish-emulator.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -eux -o pipefail
+
+CONFIG="${SUSHY_TOOLS_CONFIG:-/root/sushy/conf.py}"
+ARGS=
+
+if [[ -f "${CONFIG}" ]]; then
+    ARGS="${ARGS} --config ${CONFIG}"
+fi
+
+if [[ ! -f "${CONFIG}" ]] || ! grep -q "^SUSHY_EMULATOR_LISTEN_IP =" "${CONFIG}"; then
+    # Listen on all interfaces unless explicitly configured otherwise.
+    ARGS="${ARGS} --interface ::"
+fi
+
+# shellcheck disable=SC2086
+exec /usr/local/bin/sushy-emulator --debug $ARGS