Infra: Docker DNS on Nomad hosts

+ Make the host default resolver

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: Ifadb8901c66b65b2213878180c87370262ab22f0

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 cd7a739..f3b8886 100644 (file)
--- 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"
 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 447f6a9..019cd5a 100644 (file)
--- 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"
 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 22107c4..ad33f02 100644 (file)
--- 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"
 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 f8b7c92..1712346 100644 (file)
--- 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"
 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 8343558..e665860 100644 (file)
--- 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 }}"
 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 8158af5..5a96b7a 100644 (file)
--- 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
 
   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"
 - 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 (file)
index 0000000..becc2b1
--- /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