From 03fb1c26859a45312a225d7235b0948a9da87baa Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 15 Jan 2022 20:27:22 +0100 Subject: extend storage/volume interface --- roles/storage/directory/volume/defaults/main.yml | 8 ++++++++ roles/storage/directory/volume/tasks/main.yml | 8 ++++++++ roles/storage/zfs/volume/tasks/main.yml | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 roles/storage/directory/volume/defaults/main.yml create mode 100644 roles/storage/directory/volume/tasks/main.yml diff --git a/roles/storage/directory/volume/defaults/main.yml b/roles/storage/directory/volume/defaults/main.yml new file mode 100644 index 00000000..2e03813c --- /dev/null +++ b/roles/storage/directory/volume/defaults/main.yml @@ -0,0 +1,8 @@ +--- +# directory_volume: +# dest: /srv/foo/bar +# mode: 0750 +# owner: root +# group: users + +directory_volume: "{{ storage_volume }}" diff --git a/roles/storage/directory/volume/tasks/main.yml b/roles/storage/directory/volume/tasks/main.yml new file mode 100644 index 00000000..ac9bf860 --- /dev/null +++ b/roles/storage/directory/volume/tasks/main.yml @@ -0,0 +1,8 @@ +--- +- name: create volume directory + file: + state: directory + path: "{{ directory_volume.dest }}" + mode: "{{ directory_volume.mode | default(omit) }}" + owner: "{{ directory_volume.owner | default(omit) }}" + group: "{{ directory_volume.group | default(omit) }}" diff --git a/roles/storage/zfs/volume/tasks/main.yml b/roles/storage/zfs/volume/tasks/main.yml index 7c2c27c7..25180fee 100644 --- a/roles/storage/zfs/volume/tasks/main.yml +++ b/roles/storage/zfs/volume/tasks/main.yml @@ -8,7 +8,9 @@ - name: bind mount filesystem vars: zfs_mountpoint: "{{ (zfs_pools[zfs_volume.pool].mountpoint, zfs_volume.name) | path_join }}" - when: zfs_volume.dest != zfs_mountpoint + when: + - "'dest' in zfs_volume" + - zfs_volume.dest != zfs_mountpoint mount: src: "{{ zfs_mountpoint }}" path: "{{ zfs_volume.dest }}" -- cgit v1.2.3