aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2021-03-06 19:34:41 +0000
committerpmikus <pmikus@cisco.com>2021-03-07 18:49:29 +0000
commit86cf937bde2df8c6879e7dfb695ecb8bb2bec0c0 (patch)
tree046c37957ac2e5a8cf8ab0ac74e82f50817f3387 /resources/tools
parentf7825e80ea0688fa337b8a36086df2e577ca6101 (diff)
Infra: Docker DNS on Nomad hosts
+ Make the host default resolver Signed-off-by: pmikus <pmikus@cisco.com> Change-Id: Ifadb8901c66b65b2213878180c87370262ab22f0
Diffstat (limited to 'resources/tools')
-rw-r--r--resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml11
-rw-r--r--resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml11
-rw-r--r--resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml10
-rw-r--r--resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml10
-rw-r--r--resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml8
-rw-r--r--resources/tools/testbed-setup/ansible/roles/docker/tasks/main.yaml12
-rw-r--r--resources/tools/testbed-setup/ansible/roles/docker/templates/daemon.json.j21
7 files changed, 58 insertions, 5 deletions
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
index cd7a739b6e..f3b8886a72 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
@@ -57,4 +57,13 @@ consul_node_role: "client"
consul_retry_servers:
- "10.30.51.30"
- "10.30.51.32"
- - "10.30.51.33" \ No newline at end of file
+ - "10.30.51.33"
+
+# Docker settings.
+docker_daemon:
+ # https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file
+ default-shm-size: "1073741824"
+ dns: [ "172.17.0.1" ]
+ dns-opts: []
+ dns-search: [ "{{ ansible_hostname }}" ]
+ host: [ "172.17.0.1:/var/run/docker.sock" ] \ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
index 447f6a98f6..019cd5a968 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
@@ -57,4 +57,13 @@ consul_node_role: "client"
consul_retry_servers:
- "10.30.51.30"
- "10.30.51.32"
- - "10.30.51.33" \ No newline at end of file
+ - "10.30.51.33"
+
+# Docker settings.
+docker_daemon:
+ # https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file
+ default-shm-size: "1073741824"
+ dns: [ "172.17.0.1" ]
+ dns-opts: []
+ dns-search: [ "{{ ansible_hostname }}" ]
+ host: [ "172.17.0.1:/var/run/docker.sock" ] \ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
index 22107c4f1a..ad33f0276e 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
@@ -61,4 +61,12 @@ consul_node_role: "client"
consul_retry_servers:
- "10.30.51.30"
- "10.30.51.32"
- - "10.30.51.33" \ No newline at end of file
+ - "10.30.51.33"
+
+# Docker settings.
+docker_daemon:
+ # https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file
+ dns: [ "172.17.0.1" ]
+ dns-opts: []
+ dns-search: [ "{{ ansible_hostname }}" ]
+ storage-driver: "overlay2" \ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
index f8b7c92df4..1712346116 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
@@ -61,4 +61,12 @@ consul_node_role: "client"
consul_retry_servers:
- "10.30.51.30"
- "10.30.51.32"
- - "10.30.51.33" \ No newline at end of file
+ - "10.30.51.33"
+
+# Docker settings.
+docker_daemon:
+ # https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file
+ dns: [ "172.17.0.1" ]
+ dns-opts: []
+ dns-search: [ "{{ ansible_hostname }}" ]
+ storage-driver: "overlay2" \ No newline at end of file
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