From 86cf937bde2df8c6879e7dfb695ecb8bb2bec0c0 Mon Sep 17 00:00:00 2001 From: pmikus Date: Sat, 6 Mar 2021 19:34:41 +0000 Subject: Infra: Docker DNS on Nomad hosts + Make the host default resolver Signed-off-by: pmikus Change-Id: Ifadb8901c66b65b2213878180c87370262ab22f0 --- .../testbed-setup/ansible/roles/docker/defaults/main.yaml | 8 +++++++- .../tools/testbed-setup/ansible/roles/docker/tasks/main.yaml | 12 ++++++++++++ .../ansible/roles/docker/templates/daemon.json.j2 | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 resources/tools/testbed-setup/ansible/roles/docker/templates/daemon.json.j2 (limited to 'resources/tools/testbed-setup/ansible/roles') diff --git a/resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml index 8343558238..e665860dfb 100644 --- a/resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml @@ -35,4 +35,10 @@ docker_daemon_environment_http: - "NO_PROXY={{ proxy_env.no_proxy }}" docker_daemon_environment_https: - "HTTPS_PROXY={{ proxy_env.https_proxy }}" - - "NO_PROXY={{ proxy_env.no_proxy }}" \ No newline at end of file + - "NO_PROXY={{ proxy_env.no_proxy }}" + +docker_daemon: + # https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file + dns: [ "172.17.0.1" ] + dns-opts: [] + dns-search: [ "{{ansible_hostname}}" ] \ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/roles/docker/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/docker/tasks/main.yaml index 8158af51b4..5a96b7a7c5 100644 --- a/resources/tools/testbed-setup/ansible/roles/docker/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/docker/tasks/main.yaml @@ -29,6 +29,18 @@ tags: - docker-conf-service +- name: Conf - Docker Daemon + template: + src: "templates/daemon.json.j2" + dest: "/etc/docker/daemon.json" + owner: "root" + group: "root" + mode: "0644" + when: > + docker_daemon is defined + tags: + - docker-conf-daemon + - name: Conf - Docker HTTP Proxy template: src: "templates/docker.service.proxy.http" diff --git a/resources/tools/testbed-setup/ansible/roles/docker/templates/daemon.json.j2 b/resources/tools/testbed-setup/ansible/roles/docker/templates/daemon.json.j2 new file mode 100644 index 0000000000..becc2b1af7 --- /dev/null +++ b/resources/tools/testbed-setup/ansible/roles/docker/templates/daemon.json.j2 @@ -0,0 +1 @@ +{{ docker_daemon | to_nice_json }} \ No newline at end of file -- cgit 1.2.3-korg