diff options
Diffstat (limited to 'roles/docker')
| -rw-r--r-- | roles/docker/engine/defaults/main.yml (renamed from roles/docker/defaults/main.yml) | 0 | ||||
| -rw-r--r-- | roles/docker/engine/handlers/main.yml (renamed from roles/docker/handlers/main.yml) | 0 | ||||
| -rw-r--r-- | roles/docker/engine/tasks/lvm.yml (renamed from roles/docker/tasks/lvm.yml) | 0 | ||||
| -rw-r--r-- | roles/docker/engine/tasks/main.yml (renamed from roles/docker/tasks/main.yml) | 25 | ||||
| -rw-r--r-- | roles/docker/engine/tasks/zfs.yml (renamed from roles/docker/tasks/zfs.yml) | 0 | ||||
| -rw-r--r-- | roles/docker/files/docker-com.gpg | bin | 2760 -> 0 bytes | |||
| -rw-r--r-- | roles/docker/tasks/docker-com.yml | 19 |
7 files changed, 13 insertions, 31 deletions
diff --git a/roles/docker/defaults/main.yml b/roles/docker/engine/defaults/main.yml index b2c21963..b2c21963 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/engine/defaults/main.yml diff --git a/roles/docker/handlers/main.yml b/roles/docker/engine/handlers/main.yml index 3627303e..3627303e 100644 --- a/roles/docker/handlers/main.yml +++ b/roles/docker/engine/handlers/main.yml diff --git a/roles/docker/tasks/lvm.yml b/roles/docker/engine/tasks/lvm.yml index 34cbab0f..34cbab0f 100644 --- a/roles/docker/tasks/lvm.yml +++ b/roles/docker/engine/tasks/lvm.yml diff --git a/roles/docker/tasks/main.yml b/roles/docker/engine/tasks/main.yml index 62712551..68a6504e 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/engine/tasks/main.yml @@ -2,17 +2,17 @@ - name: install docker daemon config when: docker_daemon_config is defined block: - - name: create docker config directory - file: - name: /etc/docker - state: directory - mode: 0700 + - name: create docker config directory + file: + name: /etc/docker + state: directory + mode: 0700 - - name: write docker daemon config - copy: - content: "{{ docker_daemon_config | to_nice_json }}\n" - dest: /etc/docker/daemon.json -# notify: restart docker ### this does not work on first install because adding the repo might flush handlers... + - name: write docker daemon config + copy: + content: "{{ docker_daemon_config | to_nice_json }}\n" + dest: /etc/docker/daemon.json + notify: restart docker - name: prepare /var/lib/docker as LVM when: docker_lvm is defined @@ -24,7 +24,8 @@ - name: prepare package provider when: docker_pkg_provider != 'distro' - include_tasks: "{{ docker_pkg_provider }}.yml" + include_role: + name: "apt-repo/{{ docker_pkg_provider }}" - name: install docker apt: @@ -38,7 +39,7 @@ name: "{{ docker_pkg_name }}" selection: hold -- name: Start and enable docker +- name: start and enable docker service: name: docker enabled: true diff --git a/roles/docker/tasks/zfs.yml b/roles/docker/engine/tasks/zfs.yml index e8289c7d..e8289c7d 100644 --- a/roles/docker/tasks/zfs.yml +++ b/roles/docker/engine/tasks/zfs.yml diff --git a/roles/docker/files/docker-com.gpg b/roles/docker/files/docker-com.gpg Binary files differdeleted file mode 100644 index e5dc8cfd..00000000 --- a/roles/docker/files/docker-com.gpg +++ /dev/null diff --git a/roles/docker/tasks/docker-com.yml b/roles/docker/tasks/docker-com.yml deleted file mode 100644 index f44d2755..00000000 --- a/roles/docker/tasks/docker-com.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- name: add repository key - copy: - src: docker-com.gpg - dest: /etc/apt/trusted.gpg.d/docker.gpg - register: apt_repo_docker_com_key - -- name: add repository entry - copy: - content: | - deb https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable - dest: /etc/apt/sources.list.d/docker.list - register: apt_repo_docker_com_key - -- name: update apt cache - when: apt_repo_docker_com_key is changed or - apt_repo_docker_com_sources is changed - apt: - update_cache: yes |