From b41cd70e60d135d7d6b734746cecdd4ddf4c6d38 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 4 Apr 2021 16:28:25 +0200 Subject: port docker/engine to new storage volume roles --- inventory/group_vars/emc/vars.yml | 3 ++- inventory/group_vars/lendwirbel-live/vars.yml | 3 ++- inventory/host_vars/ch-dione.yml | 3 ++- inventory/host_vars/ch-helene.yml | 3 ++- inventory/host_vars/ch-k8s-master.yml | 3 ++- inventory/host_vars/ch-thetys.yml | 3 ++- inventory/host_vars/ele-dione.yml | 3 ++- inventory/host_vars/ele-helene.yml | 3 ++- inventory/host_vars/ele-media.yml | 3 ++- inventory/host_vars/ele-thetys.yml | 3 ++- inventory/host_vars/emc-master.yml | 3 ++- inventory/host_vars/glt-calypso.yml | 3 ++- inventory/host_vars/glt-coturn.yml | 3 ++- inventory/host_vars/glt-datacop.yml | 3 ++- inventory/host_vars/glt-dione.yml | 3 ++- inventory/host_vars/glt-helene.yml | 3 ++- inventory/host_vars/glt-jitsi.yml | 3 ++- inventory/host_vars/glt-telesto.yml | 3 ++- inventory/host_vars/glt-thetys.yml | 3 ++- inventory/host_vars/lw-dione.yml | 3 ++- inventory/host_vars/lw-helene.yml | 3 ++- inventory/host_vars/lw-master.yml | 3 ++- inventory/host_vars/lw-thetys.yml | 3 ++- inventory/host_vars/s2-dione.yml | 3 ++- inventory/host_vars/s2-helene.yml | 3 ++- inventory/host_vars/s2-thetys.yml | 3 ++- inventory/host_vars/sk-cloudio/vars.yml | 3 ++- inventory/host_vars/sk-tomnext-nc.yml | 3 ++- roles/docker/engine/tasks/lvm.yml | 18 ------------------ roles/docker/engine/tasks/main.yml | 13 ++++++------- roles/docker/engine/tasks/zfs.yml | 14 -------------- 31 files changed, 62 insertions(+), 67 deletions(-) delete mode 100644 roles/docker/engine/tasks/lvm.yml delete mode 100644 roles/docker/engine/tasks/zfs.yml diff --git a/inventory/group_vars/emc/vars.yml b/inventory/group_vars/emc/vars.yml index 785f1a99..2f6d1584 100644 --- a/inventory/group_vars/emc/vars.yml +++ b/inventory/group_vars/emc/vars.yml @@ -8,7 +8,8 @@ install: network: {} -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/group_vars/lendwirbel-live/vars.yml b/inventory/group_vars/lendwirbel-live/vars.yml index 0e037e9b..6c2e8389 100644 --- a/inventory/group_vars/lendwirbel-live/vars.yml +++ b/inventory/group_vars/lendwirbel-live/vars.yml @@ -15,7 +15,8 @@ install: network: {} -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml index 1ac451b4..072321bf 100644 --- a/inventory/host_vars/ch-dione.yml +++ b/inventory/host_vars/ch-dione.yml @@ -64,7 +64,8 @@ admin_users_host: blackmagic_desktopvideo_version: 11.7a12 -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml index 68a71a8f..99ec0593 100644 --- a/inventory/host_vars/ch-helene.yml +++ b/inventory/host_vars/ch-helene.yml @@ -60,7 +60,8 @@ admin_users_host: blackmagic_desktopvideo_version: 11.7a12 -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/host_vars/ch-k8s-master.yml b/inventory/host_vars/ch-k8s-master.yml index d5070c38..6e353684 100644 --- a/inventory/host_vars/ch-k8s-master.yml +++ b/inventory/host_vars/ch-k8s-master.yml @@ -51,7 +51,8 @@ network: - *_network_primary_ -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 7G diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml index 55a4f1af..01d15b68 100644 --- a/inventory/host_vars/ch-thetys.yml +++ b/inventory/host_vars/ch-thetys.yml @@ -33,7 +33,8 @@ blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com docker_pkg_name: docker-ce -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 10G diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml index 27d067fa..16bfd158 100644 --- a/inventory/host_vars/ele-dione.yml +++ b/inventory/host_vars/ele-dione.yml @@ -26,7 +26,8 @@ base_packages_extra_host: admin_users_host: - equinox -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml index ba939034..5d15ef85 100644 --- a/inventory/host_vars/ele-helene.yml +++ b/inventory/host_vars/ele-helene.yml @@ -26,7 +26,8 @@ base_packages_extra_host: admin_users_host: - equinox -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml index 54a4e827..24d13946 100644 --- a/inventory/host_vars/ele-media.yml +++ b/inventory/host_vars/ele-media.yml @@ -31,7 +31,8 @@ docker_daemon_config: bridge: "none" iptables: false -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 20G diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index f0f14f1e..73807915 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -28,7 +28,8 @@ apt_repo_components: docker_pkg_provider: docker-com docker_pkg_name: docker-ce -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 10G diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml index 1ed802df..f2e62131 100644 --- a/inventory/host_vars/emc-master.yml +++ b/inventory/host_vars/emc-master.yml @@ -34,7 +34,8 @@ network: external_ip: "{{ network.primary.overlay }}" -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 7G diff --git a/inventory/host_vars/glt-calypso.yml b/inventory/host_vars/glt-calypso.yml index 4a1ef868..2ec8a28f 100644 --- a/inventory/host_vars/glt-calypso.yml +++ b/inventory/host_vars/glt-calypso.yml @@ -48,7 +48,8 @@ blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com docker_pkg_name: docker-ce -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/host_vars/glt-coturn.yml b/inventory/host_vars/glt-coturn.yml index 97a11885..f3f814d0 100644 --- a/inventory/host_vars/glt-coturn.yml +++ b/inventory/host_vars/glt-coturn.yml @@ -1,5 +1,6 @@ --- -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 5G diff --git a/inventory/host_vars/glt-datacop.yml b/inventory/host_vars/glt-datacop.yml index cb92f3c8..978ad21e 100644 --- a/inventory/host_vars/glt-datacop.yml +++ b/inventory/host_vars/glt-datacop.yml @@ -47,7 +47,8 @@ blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com docker_pkg_name: docker-ce -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/host_vars/glt-dione.yml b/inventory/host_vars/glt-dione.yml index bf6b3c54..b5ab1125 100644 --- a/inventory/host_vars/glt-dione.yml +++ b/inventory/host_vars/glt-dione.yml @@ -48,7 +48,8 @@ blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com docker_pkg_name: docker-ce -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/host_vars/glt-helene.yml b/inventory/host_vars/glt-helene.yml index 06740263..a7a32604 100644 --- a/inventory/host_vars/glt-helene.yml +++ b/inventory/host_vars/glt-helene.yml @@ -48,7 +48,8 @@ blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com docker_pkg_name: docker-ce -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/host_vars/glt-jitsi.yml b/inventory/host_vars/glt-jitsi.yml index 7e38984f..15a27ffb 100644 --- a/inventory/host_vars/glt-jitsi.yml +++ b/inventory/host_vars/glt-jitsi.yml @@ -1,5 +1,6 @@ --- -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 5G diff --git a/inventory/host_vars/glt-telesto.yml b/inventory/host_vars/glt-telesto.yml index 962475d1..04cab4e8 100644 --- a/inventory/host_vars/glt-telesto.yml +++ b/inventory/host_vars/glt-telesto.yml @@ -48,7 +48,8 @@ blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com docker_pkg_name: docker-ce -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/host_vars/glt-thetys.yml b/inventory/host_vars/glt-thetys.yml index 9fcb579c..37916df5 100644 --- a/inventory/host_vars/glt-thetys.yml +++ b/inventory/host_vars/glt-thetys.yml @@ -61,7 +61,8 @@ blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com docker_pkg_name: docker-ce -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 10G diff --git a/inventory/host_vars/lw-dione.yml b/inventory/host_vars/lw-dione.yml index a8c5a0b9..e5073987 100644 --- a/inventory/host_vars/lw-dione.yml +++ b/inventory/host_vars/lw-dione.yml @@ -27,7 +27,8 @@ base_packages_extra_host: admin_users_host: - equinox -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/host_vars/lw-helene.yml b/inventory/host_vars/lw-helene.yml index 4874b6dc..a45f02d0 100644 --- a/inventory/host_vars/lw-helene.yml +++ b/inventory/host_vars/lw-helene.yml @@ -27,7 +27,8 @@ base_packages_extra_host: admin_users_host: - equinox -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/host_vars/lw-master.yml b/inventory/host_vars/lw-master.yml index 1ed802df..f2e62131 100644 --- a/inventory/host_vars/lw-master.yml +++ b/inventory/host_vars/lw-master.yml @@ -34,7 +34,8 @@ network: external_ip: "{{ network.primary.overlay }}" -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 7G diff --git a/inventory/host_vars/lw-thetys.yml b/inventory/host_vars/lw-thetys.yml index 0deedcda..2c5d998c 100644 --- a/inventory/host_vars/lw-thetys.yml +++ b/inventory/host_vars/lw-thetys.yml @@ -29,7 +29,8 @@ apt_repo_components: docker_pkg_provider: docker-com docker_pkg_name: docker-ce -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 10G diff --git a/inventory/host_vars/s2-dione.yml b/inventory/host_vars/s2-dione.yml index 0c0757c2..aed070dc 100644 --- a/inventory/host_vars/s2-dione.yml +++ b/inventory/host_vars/s2-dione.yml @@ -19,7 +19,8 @@ base_packages_extra_host: admin_users_host: - equinox -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/host_vars/s2-helene.yml b/inventory/host_vars/s2-helene.yml index 3d7036b0..cbef7df3 100644 --- a/inventory/host_vars/s2-helene.yml +++ b/inventory/host_vars/s2-helene.yml @@ -19,7 +19,8 @@ base_packages_extra_host: admin_users_host: - equinox -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 15G diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml index 69ca2782..c16b26b3 100644 --- a/inventory/host_vars/s2-thetys.yml +++ b/inventory/host_vars/s2-thetys.yml @@ -35,7 +35,8 @@ blackmagic_desktopvideo_version: 11.7a12 docker_pkg_provider: docker-com docker_pkg_name: docker-ce -docker_lvm: +docker_storage: + type: lvm vg: "{{ host_name }}" lv: docker size: 10G diff --git a/inventory/host_vars/sk-cloudio/vars.yml b/inventory/host_vars/sk-cloudio/vars.yml index ef891e1d..54c67520 100644 --- a/inventory/host_vars/sk-cloudio/vars.yml +++ b/inventory/host_vars/sk-cloudio/vars.yml @@ -42,7 +42,8 @@ zfs_sanoid_modules: process_children_only: yes -docker_zfs: +docker_storage: + type: zfs pool: storage name: docker properties: diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml index 94996a23..f7e208fe 100644 --- a/inventory/host_vars/sk-tomnext-nc.yml +++ b/inventory/host_vars/sk-tomnext-nc.yml @@ -76,7 +76,8 @@ zfs_sanoid_modules: process_children_only: yes -docker_zfs: +docker_storage: + type: zfs pool: storage name: docker properties: diff --git a/roles/docker/engine/tasks/lvm.yml b/roles/docker/engine/tasks/lvm.yml deleted file mode 100644 index 34cbab0f..00000000 --- a/roles/docker/engine/tasks/lvm.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- name: create logical volume - lvol: - vg: "{{ docker_lvm.vg }}" - lv: "{{ docker_lvm.lv }}" - size: "{{ docker_lvm.size }}" - -- name: create filesystem - filesystem: - fstype: "{{ docker_lvm.fs }}" - dev: "/dev/mapper/{{ docker_lvm.vg | replace('-', '--') }}-{{ docker_lvm.lv | replace('-', '--') }}" - -- name: mount filesytem - mount: - src: "/dev/mapper/{{ docker_lvm.vg | replace('-', '--') }}-{{ docker_lvm.lv | replace('-', '--') }}" - path: /var/lib/docker - fstype: "{{ docker_lvm.fs }}" - state: mounted diff --git a/roles/docker/engine/tasks/main.yml b/roles/docker/engine/tasks/main.yml index 6c07797e..7bfd3eeb 100644 --- a/roles/docker/engine/tasks/main.yml +++ b/roles/docker/engine/tasks/main.yml @@ -14,13 +14,12 @@ dest: /etc/docker/daemon.json notify: restart docker -- name: prepare /var/lib/docker as LVM - when: docker_lvm is defined - import_tasks: lvm.yml - -- name: prepare /var/lib/docker as ZFS dataset - when: docker_zfs is defined - import_tasks: zfs.yml +- name: prepare storage volume for /var/lib/docker + when: docker_storage is defined + vars: + storage_volume: "{{ docker_storage | combine({'dest': '/var/lib/docker'})}}" + include_role: + name: "storage/{{ docker_storage.type }}/volume" - name: prepare package provider when: docker_pkg_provider != 'distro' diff --git a/roles/docker/engine/tasks/zfs.yml b/roles/docker/engine/tasks/zfs.yml deleted file mode 100644 index e8289c7d..00000000 --- a/roles/docker/engine/tasks/zfs.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- name: create zfs dataset - zfs: - name: "{{ docker_zfs.pool }}/{{ docker_zfs.name }}" - state: present - extra_zfs_properties: "{{ docker_zfs.properties | default(omit) }}" - -- name: bind mount filesytem - mount: - src: "{{ zfs_pools[docker_zfs.pool].mountpoint }}/{{ docker_zfs.name }}" - path: /var/lib/docker - fstype: none - opts: bind,x-systemd.automount,nofail - state: mounted -- cgit v1.2.3