Merge "Allow to configure dnsmasq image in developer installation"

This commit is contained in:
Zuul 2019-08-27 18:31:12 +00:00 committed by Gerrit Code Review
commit 5840bde430
1 changed files with 3 additions and 1 deletions

View File

@ -21,6 +21,8 @@ set -xe
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 \