From 6bfa7d01d9bdcfff204a1ddf8ff11c7ef7631eab Mon Sep 17 00:00:00 2001 From: Andrii Ostapenko Date: Tue, 13 Aug 2019 20:49:30 -0500 Subject: [PATCH] Allow to configure dnsmasq image in developer installation Change-Id: Ie39a5f306674a68c8663f9c9e598229bb9fbad50 --- tools/deployment/developer/common/170-setup-gateway.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/deployment/developer/common/170-setup-gateway.sh b/tools/deployment/developer/common/170-setup-gateway.sh index 31b441d9d3..691612cc42 100755 --- a/tools/deployment/developer/common/170-setup-gateway.sh +++ b/tools/deployment/developer/common/170-setup-gateway.sh @@ -21,6 +21,8 @@ OSH_EXT_SUBNET="172.24.4.0/24" sudo ip addr add ${OSH_BR_EX_ADDR} dev br-ex sudo ip link set br-ex up +: ${DNSMASQ_IMAGE:=docker.io/openstackhelm/neutron:ocata} + # NOTE(portdirect): With Docker >= 1.13.1 the default FORWARD chain policy is # configured to DROP, for the l3 agent to function as expected and for # VMs to reach the outside world correctly this needs to be set to ACCEPT. @@ -37,7 +39,7 @@ sudo docker run -d \ --cap-add=NET_ADMIN \ --volume /etc/kubernetes/kubelet-resolv.conf:/etc/kubernetes/kubelet-resolv.conf:ro \ --entrypoint dnsmasq \ - docker.io/openstackhelm/neutron:ocata \ + ${DNSMASQ_IMAGE} \ --keep-in-foreground \ --no-hosts \ --bind-interfaces \