diff options
-rw-r--r-- | dan/ele-media.yml | 2 | ||||
-rw-r--r-- | dan/ele-uhrturm.yml | 2 | ||||
-rw-r--r-- | roles/apt-repo/docker-com/files/repo.gpg (renamed from roles/docker/files/docker-com.gpg) | bin | 2760 -> 2760 bytes | |||
-rw-r--r-- | roles/apt-repo/docker-com/tasks/main.yml (renamed from roles/docker/tasks/docker-com.yml) | 8 | ||||
-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/kubernetes/base/tasks/cri_docker.yml | 2 |
10 files changed, 20 insertions, 19 deletions
diff --git a/dan/ele-media.yml b/dan/ele-media.yml index e30294be..f42d7e02 100644 --- a/dan/ele-media.yml +++ b/dan/ele-media.yml @@ -12,7 +12,7 @@ - role: apt-repo/spreadspace - role: acmetool/base - role: mysql - - role: docker + - role: docker/engine - role: nginx/base - role: elevate/media - role: wireguard/base diff --git a/dan/ele-uhrturm.yml b/dan/ele-uhrturm.yml index e84ac63b..4e6da456 100644 --- a/dan/ele-uhrturm.yml +++ b/dan/ele-uhrturm.yml @@ -10,4 +10,4 @@ - role: core/admin-users - role: streaming/blackmagic/desktopvideo - role: apt-repo/spreadspace - - role: docker + - role: docker/engine diff --git a/roles/docker/files/docker-com.gpg b/roles/apt-repo/docker-com/files/repo.gpg Binary files differindex e5dc8cfd..e5dc8cfd 100644 --- a/roles/docker/files/docker-com.gpg +++ b/roles/apt-repo/docker-com/files/repo.gpg diff --git a/roles/docker/tasks/docker-com.yml b/roles/apt-repo/docker-com/tasks/main.yml index f44d2755..df879a89 100644 --- a/roles/docker/tasks/docker-com.yml +++ b/roles/apt-repo/docker-com/tasks/main.yml @@ -1,16 +1,16 @@ --- - name: add repository key copy: - src: docker-com.gpg - dest: /etc/apt/trusted.gpg.d/docker.gpg + src: repo.gpg + dest: /etc/apt/trusted.gpg.d/docker-com.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 + dest: /etc/apt/sources.list.d/docker-com.list + register: apt_repo_docker_com_sources - name: update apt cache when: apt_repo_docker_com_key is changed or 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/kubernetes/base/tasks/cri_docker.yml b/roles/kubernetes/base/tasks/cri_docker.yml index b5024163..44f3f82e 100644 --- a/roles/kubernetes/base/tasks/cri_docker.yml +++ b/roles/kubernetes/base/tasks/cri_docker.yml @@ -23,4 +23,4 @@ - name: install docker include_role: - name: docker + name: docker/engine |