summaryrefslogtreecommitdiffstats
path: root/ansible/docker
diff options
context:
space:
mode:
authorMichal Zegan <m.zegan@samsung.com>2019-01-04 14:20:03 +0100
committerMichal Zegan <m.zegan@samsung.com>2019-01-17 15:19:21 +0100
commitb5cd82b2ec6f4fe69eae27f70eb3b5eda52da368 (patch)
tree060acfd9bd4241bb1755fbde9c2ad1a7150f39b0 /ansible/docker
parentcde2f33dfcd9728240d37c80383534a5b6af5caf (diff)
Fix docker config handling in offline installer
This fixes adding of dns address to /etc/docker/daemon.json to always use infra's ip address instead of possibly using it's hostname. Also similar change is done in handling of /etc/resolv.conf in infrastructure.yml. Ip address is specified by the "cluster_ip" variable placed on a host. Inventory specifies ip for everything except resource server (just for consistency). Change-Id: I2baa3f4c7d69b8dff109b5f8ae984134caf2af7d Issue-ID: OOM-1573 Signed-off-by: Michal Zegan <m.zegan@samsung.com>
Diffstat (limited to 'ansible/docker')
-rw-r--r--ansible/docker/Dockerfile1
1 files changed, 1 insertions, 0 deletions
diff --git a/ansible/docker/Dockerfile b/ansible/docker/Dockerfile
index b0172709..4cefa8b7 100644
--- a/ansible/docker/Dockerfile
+++ b/ansible/docker/Dockerfile
@@ -24,6 +24,7 @@ RUN apk --no-cache update \
&& pip3 install --no-cache-dir \
ansible==$ansible_version \
jmespath \
+ netaddr \
&& apk del build-dependencies && rm -rf /var/cache/apk/*
ENV ANSIBLE_HOST_KEY_CHECKING false