From 9301142d3615d6989d8dfbf96801b1e76df784c3 Mon Sep 17 00:00:00 2001 From: Shaun Smiley Date: Mon, 14 Jan 2019 11:17:00 -0800 Subject: [PATCH] readd remote access, with optional ip --- defaults/main.yml | 2 ++ tasks/main.yml | 3 +++ tasks/remote-access.yml | 22 ++++++++++++++++++++++ templates/override.conf.j2 | 1 - 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 tasks/remote-access.yml diff --git a/defaults/main.yml b/defaults/main.yml index 2bcb620..95b7068 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -27,3 +27,5 @@ docker_yum_repo_enable_test: 0 # A list of users who will be added to the docker group. docker_users: [] + +docker_remote_access: False diff --git a/tasks/main.yml b/tasks/main.yml index f248279..15778c3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -29,3 +29,6 @@ - include_tasks: docker-users.yml when: docker_users + +- include_tasks: remote-access.yml + when: docker_remote_access diff --git a/tasks/remote-access.yml b/tasks/remote-access.yml new file mode 100644 index 0000000..ab3202b --- /dev/null +++ b/tasks/remote-access.yml @@ -0,0 +1,22 @@ +--- +- name: add docker.service.d/override.conf override + copy: + dest: /etc/systemd/system/docker.service.d/startup_options.conf + content: | + # /etc/systemd/system/docker.service.d/override.conf + [Service] + ExecStart= + ExecStart=/usr/bin/dockerd -H fd:// -H tcp://{{ docker_remote_access_ip | default('0.0.0.0') }}:2375 + register: docker_override + +- name: reload docker daemon + systemd: + daemon_reload: yes + when: docker_override is changed + +- name: restart docker service + service: + name: docker + state: restarted + daemon_reload: yes + when: docker_override is changed diff --git a/templates/override.conf.j2 b/templates/override.conf.j2 index 17b0abf..adab53c 100644 --- a/templates/override.conf.j2 +++ b/templates/override.conf.j2 @@ -1,4 +1,3 @@ # {{ ansible_managed }} [Service] ExecStartPre= -{% if docker_exec_start is defined %}ExecStart={{ docker_exec_start }}{% endif %}