From 23db20bbde355b2ce28c5e6e175244dda461f3a2 Mon Sep 17 00:00:00 2001 From: Bruce Becker Date: Fri, 21 Oct 2016 11:04:27 +0200 Subject: [PATCH] changing the format - no substantive changes made --- handlers/main.yml | 4 +++- tasks/main.yml | 38 ++++++++++++++++++++++++++++---------- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index 1a7e973..501fec7 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -3,4 +3,6 @@ command: systemctl daemon-reload - name: restart docker - service: name=docker state=restarted + service: + name: docker + state: restarted diff --git a/tasks/main.yml b/tasks/main.yml index 0c5e6be..f50f5db 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,25 +1,37 @@ --- - name: ensure repo is present - copy: src=files/docker.repo dest=/etc/yum.repos.d/docker.repo + copy: + src: docker.repo + dest: /etc/yum.repos.d/docker.repo when: not docker_rc - name: ensure testing repo is present - copy: src=files/docker-testing.repo dest=/etc/yum.repos.d/docker-testing.repo + copy: + src: docker-testing.repo + dest: /etc/yum.repos.d/docker-testing.repo when: docker_rc - name: ensure docker is installed - yum: name=docker-engine state=present + yum: + name: docker-engine + state: present - name: ensure config folder is present - file: path=/etc/docker state=directory + file: + path: /etc/docker + state: directory - name: ensure daemon config file is present - template: src=daemon.j2.json dest=/etc/docker/daemon.json + template: + src: daemon.j2.json + dest: /etc/docker/daemon.json notify: - restart docker - name: ensure unit file is present & up to date - copy: src=files/docker.service dest=/usr/lib/systemd/system/docker.service + copy: + src: docker.service + dest: /usr/lib/systemd/system/docker.service notify: - reload unit - restart docker @@ -27,7 +39,13 @@ - meta: flush_handlers - name: ensure starts on system boot - service: name=docker enabled=yes - -- name: ensure vagrant user can run docker commands - user: name=vagrant groups=docker append=yes + service: + name: docker + enabled: yes + +# I don't want vagrant +# - name: ensure vagrant user can run docker commands +# user: +# name: vagrant +# groups: docker +# append: yes