Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Infra: Docker DNS on Nomad hosts
[csit.git]
/
resources
/
tools
/
testbed-setup
/
ansible
/
roles
/
docker
/
tasks
/
main.yaml
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
d3eef82
..
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
@@
-7,10
+7,10
@@
- name: Inst - Docker
package:
- name: Inst - Docker
package:
- name: "{{ docker_package }}"
+ name:
+ - "{{ docker_package }}"
+ - "{{ docker_package }}-cli"
state: "{{ docker_package_state }}"
state: "{{ docker_package_state }}"
- notify:
- - "Restart Docker"
tags:
- docker-inst-package
tags:
- docker-inst-package
@@
-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"
@@
-68,5
+80,3
@@
when: docker_users
tags:
- docker-conf-user
when: docker_users
tags:
- docker-conf-user
-
-- meta: flush_handlers