From e2fbffad88b3772911c448a17cb49c10a0713fa5 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Wed, 19 Apr 2017 12:40:11 +0200 Subject: [PATCH] Fix for nspawn test Signed-off-by: Petr "Stone" Hracek --- tests/config.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/config.yaml b/tests/config.yaml index 048c785..1c3e267 100644 --- a/tests/config.yaml +++ b/tests/config.yaml @@ -15,9 +15,7 @@ source: https://github.com/container-images/haproxy module: docker: setup: cp -f my-haproxy.cfg local-haproxy.cfg; - IPR=`ip r |grep default |cut -d ' ' -f 5`; - IPA=`ip a s dev $IPR |egrep -o 'inet [0-9.]+' |egrep -o [0-9.]+`; - sed s/127.0.0.1/$IPA/ -i local-haproxy.cfg; + sed s/127.0.0.1/{HOSTIPADDR}/ -i local-haproxy.cfg; start: "docker run -it -p 8077:80 -v $(pwd)/local-haproxy.cfg:/etc/haproxy/haproxy.cfg:Z" labels: description: "HAProxy is a TCP/HTTP reverse proxy which is particularly suited for high availability environments." @@ -26,7 +24,7 @@ module: rpm: setup: cp -f my-haproxy.cfg local-haproxy.cfg; sed -i 's/bind.*/bind :8077/' local-haproxy.cfg; - cp local-haproxy.cfg /etc/haproxy/haproxy.cfg; + cp local-haproxy.cfg {ROOT}/etc/haproxy/haproxy.cfg; semanage port -a -t http_port_t -p tcp 8001; semanage port -a -t http_port_t -p tcp 8000; semanage port -a -t http_port_t -p tcp 8077;