summaryrefslogtreecommitdiffstats
path: root/core/modules/dnbd3-proxy-mode
diff options
context:
space:
mode:
authorSimon Rettberg2017-11-02 13:51:49 +0100
committerSimon Rettberg2017-11-02 13:51:49 +0100
commit5afdf4449e0c1eeca4e8b2f3c4141f49f0bf1b04 (patch)
treed84acf408a21d409b9340033bf3c9ed5dfefe8c4 /core/modules/dnbd3-proxy-mode
parent[dnbd3-proxy-mode] Run dnbd3-server in -errormsg mode if setup failed (diff)
downloadmltk-5afdf4449e0c1eeca4e8b2f3c4141f49f0bf1b04.tar.gz
mltk-5afdf4449e0c1eeca4e8b2f3c4141f49f0bf1b04.tar.xz
mltk-5afdf4449e0c1eeca4e8b2f3c4141f49f0bf1b04.zip
[dnbd3-proxy-mode] Support new lookupMissingForProxy option of dnbd3-server
Diffstat (limited to 'core/modules/dnbd3-proxy-mode')
-rwxr-xr-xcore/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy b/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy
index f5915ee7..e493bdfe 100755
--- a/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy
+++ b/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy
@@ -65,7 +65,12 @@ fi
. /opt/openslx/config
DNBD3_BGR="false"
-[ -n "${SLX_DNBD3_BGR}" ] && DNBD3_BGR="true"
+DNBD3_LOOKUP="false"
+if [ -n "${SLX_DNBD3_BGR}" ]; then
+ DNBD3_BGR="true"
+ # Only do chained lookup of image if we're a global proxy with BGR
+ [ -z "${SLX_DNBD3_WHITELIST}" ] && DNBD3_LOOKUP="true"
+fi
DNBD3_PORT=5003
rm -f "${DNBD3_CONF_DIR}/server.conf"
# Refer to http://git.openslx.org/dnbd3.git/tree/conf for configuration options
@@ -77,6 +82,7 @@ serverPenalty=100000
clientPenalty=0
isProxy=true
backgroundReplication=${DNBD3_BGR}
+lookupMissingForProxy=${DNBD3_LOOKUP}
removeMissingImages=false
uplinkTimeout=5000
clientTimeout=15000