From ba5d929fce982af9baa44cfe8ad0b3079133f444 Mon Sep 17 00:00:00 2001 From: Charlie Mordant Date: Wed, 15 Apr 2020 15:14:30 +0200 Subject: [PATCH] use dots instead of carets --- handlers/main.yml | 41 -------- molecule/default/converge.yml | 2 +- .../test_default.cpython-27-PYTEST.pyc | Bin 4840 -> 5120 bytes molecule/default/tests/test_default.py | 4 + tasks/create_lv.yml | 88 ++++------------ tasks/create_vg.yml | 22 ++-- tasks/main.yml | 4 +- tasks/manage_lvm.yml | 94 +++++++----------- 8 files changed, 70 insertions(+), 185 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index db4600d..c4e1266 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,44 +1,3 @@ --- # handlers file for ansible-manage-lvm -- name: manage_lvm | resizing swap - shell: "swapoff -a && mkswap /dev/{{ item[0]['vgname'] }}/{{ item[1]['lvname'] }} && swapon -va" - become: true - with_subelements: - - "{{ lvm_groups }}" - - lvnames - when: > - item[1]['filesystem'] is defined and - item[1]['filesystem'] == "swap" -- name: manage_lvm | resizing btrfs - command: "btrfs filesystem resize max {{ item[1]['mntp'] }}" - become: true - with_subelements: - - "{{ lvm_groups }}" - - lvnames - when: > - item[1]['filesystem'] is defined and - item[1]['filesystem'] == "btrfs" - -- name: manage_lvm | resizing xfs - command: xfs_growfs -d {{ item[1]['mntp'] }} - become: true - with_subelements: - - "{{ lvm_groups }}" - - lvnames - when: > - item[1]['filesystem'] is defined and - item[1]['filesystem'] == "xfs" - -- name: manage_lvm | resizing filesystem - command: resize2fs /dev/{{ item[0]['vgname'] }}/{{ item[1]['lvname'] }} - become: true - with_subelements: - - "{{ lvm_groups }}" - - lvnames - when: > - item[1]['filesystem'] is defined and - item[1]['filesystem'] != "None" and - item[1]['filesystem'] != "swap" and - item[1]['filesystem'] != "xfs" and - item[1]['filesystem'] != "btrfs" diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 9848cce..558c977 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -18,7 +18,7 @@ size: 10%VG opts: "--wipesignatures y" create: true - filesystem: ext4 + filesystem: xfs mntp: "/var/lib/mountpoint2" manage_lvm: true diff --git a/molecule/default/tests/__pycache__/test_default.cpython-27-PYTEST.pyc b/molecule/default/tests/__pycache__/test_default.cpython-27-PYTEST.pyc index cb5ebdb4334c030b92c5ac50307aba08930c8788..a74dd9a92dbd309bbc42bd1c86eb9cc4eb9c4464 100644 GIT binary patch delta 183 zcmaE%+MprN{F#^Q71Q*%olFc2$qY~cWHUGbadGHGc^^J@h86~fC~k%nCWc@Qj*SJ; zg507YNsuZA#>poH%o#-{35v-WW!_|DV9)>w2ibrKTOgqU6k-TspX@JGp&<@rmZTP! z#Fypgl;)-y#b*}B=jNB@m87Of0;Qk^YVb_HAy~>3WIx$Us85IwD8a_e!yv@K$->FT I$#>!|xUJ;NONRok3 egM0Ezq0-68!rcNqKt3BY4}%Z`CkrPVCmR6&AP%Mg diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index ad9e53a..a97b145 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -20,3 +20,7 @@ def test_mylv_logical_volume_is_created(host): def test_volume_is_mounted(host): host.file("/var/lib/mountpoint").mode == 0o731 + + +def test_volume2_is_mounted(host): + host.file("/var/lib/mountpoint2").mode == 0o731 diff --git a/tasks/create_lv.yml b/tasks/create_lv.yml index 24f303f..837588b 100644 --- a/tasks/create_lv.yml +++ b/tasks/create_lv.yml @@ -2,85 +2,39 @@ - name: manage_lvm | creating new LVM logical volume(s) lvol: - vg: "{{ vg.item[0]['vgname'] }}" - lv: "{{ vg.item[1]['lvname'] }}" - size: "{{ vg.item[1]['size'] }}" + vg: "{{ vg.0.vgname }}" + lv: "{{ vg.1.lvname'] }}" + size: "{{ vg.1.size }}" shrink: no - opts: "{{ vg.item[1]['opts'] | default('') }}" + opts: "{{ vg.1.opts | default('') }}" state: "present" become: true - notify: - - manage_lvm | resizing swap - - manage_lvm | resizing btrfs - - manage_lvm | resizing xfs - - manage_lvm | resizing filesystem when: > ( - (vg.item[0]['create'] is defined - and vg.item[0]['create']) and - (vg.item[1] is defined and - vg.item[1] != 'None') and - (vg.item[1]['create'] is defined and - vg.item[1]['create']) + (vg.0.create is defined + and vg.0.create) and + (vg[1] is defined and + vg.1 != 'None') and + (vg.1.create is defined and + vg.1.create) ) - name: manage_lvm | creating new filesystem on new LVM logical volume(s) filesystem: - fstype: "{{ vg.item[1]['filesystem'] }}" - dev: "/dev/{{ vg.item[0]['vgname'] }}/{{ vg.item[1]['lvname'] }}" - # resizefs: yes #coming in 2.0 which will replace the resizing filesystem task below + fstype: "{{ vg.1.filesystem }}" + dev: "/dev/{{ vg.0.vgname }}/{{ vg.1.lvname }}" + resizefs: yes become: true when: > ( - (vg.item[0]['create'] is defined and - vg.item[0]['create']) and - (vg.item[1] is defined and - vg.item[1] != 'None') and - (vg.item[1]['create'] is defined and - vg.item[1]['create']) and + (vg.0.create is defined and + vg.0.create) and + (vg[1] is defined and + vg.1 != 'None') and + (vg.1.create is defined and + vg.1.create) and ( - vg.item[1]['filesystem'] is defined and - vg.item[1]['filesystem'] != 'None' and - vg.item[1]['filesystem'] != "swap" and - vg.item[1]['filesystem'] != "xfs" - ) - ) - -- name: lvm | check already converted - loop: "{{ lvm_groups|subelements('lvnames') }}" - shell: "xfs_info /dev/{{ vg.item.0.vgname }}/{{ vg.item.1.lvname }} | grep -c 'ftype=1'" - become: yes - register: alreadyformattedresult - ignore_errors: True - changed_when: no - when: > - ( - (vg.item.1 is defined and vg.item.1 != 'None') and - ( - vg.item.1.filesystem2 is defined and - vg.item.1.filesystem2 == "xfs" - ) - and - ( - vg.item.1.create is defined and - vg.item.1.create - ) - ) - -- name: manage_lvm | creating new filesystem on new LVM logical volume(s) - command: mkfs.xfs /dev/{{ vg.item.0.vgname }}/{{ vg.item.1.lvname }} - become: yes - when: > - ( - alreadyformattedresult and - (vg.item[0]['create'] is defined and - vg.item[0]['create']) and - (vg.item[1] is defined and - vg.item[1] != 'None') and - (vg.item[1]['create'] is defined and - vg.item[1]['create']) and - ( - vg.item[1]['filesystem'] is defined and - vg.item[1]['filesystem'] == "xfs" + vg.1.filesystem is defined and + vg.1.filesystem != 'None' ) ) diff --git a/tasks/create_vg.yml b/tasks/create_vg.yml index ba408ae..d79f362 100644 --- a/tasks/create_vg.yml +++ b/tasks/create_vg.yml @@ -1,22 +1,12 @@ --- -- name: manage_lvm | check existing physical volume group(s) - shell: "vgdisplay | grep '{{ item['vgname'] }}'" - become: true - with_items: "{{ lvm_groups }}" - ignore_errors: True - changed_when: no - register: vg_exist -- debug: var=vg_exist - -- name: manage_lvm | creating new LVM physical volume group(s) +- name: manage_lvm | creating new LVM volume group(s) lvg: - vg: "{{ item.item['vgname'] }}" - pvs: "{{ item.item['disks']|join(',') }}" + vg: "{{ item.vgname }}" + pvs: "{{ item.disks | join(',') }}" state: "present" become: true - with_items: "{{ vg_exist.results }}" + loop: "{{ lvm_groups }}" when: > - item.rc != 0 and - item.item['create'] is defined and - item.item['create'] + item.create is defined and + item.create diff --git a/tasks/main.yml b/tasks/main.yml index 96ebddf..86d4e50 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -8,5 +8,5 @@ - include: manage_lvm.yml when: > - manage_lvm and - lvm_groups is defined + manage_lvm and + lvm_groups is defined diff --git a/tasks/manage_lvm.yml b/tasks/manage_lvm.yml index c2f9ae1..59df20d 100644 --- a/tasks/manage_lvm.yml +++ b/tasks/manage_lvm.yml @@ -2,89 +2,67 @@ - name: manage_lvm | manage physical volume group creation include: create_vg.yml -- name: manage_lvm | check existing logical volume group(s) - shell: "lvs -o lv_name {{ item[0]['vgname'] }} --separator='|' --noheadings | grep {{ item[1]['lvname'] }}" - become: true - ignore_errors: True - changed_when: no - with_subelements: - - "{{ lvm_groups }}" - - lvnames - register: lv_exist - -- debug: var=lv_exist - - name: manage_lvm | loop over logical volume(s) include: create_lv.yml - loop: "{{ lv_exist.results }}" + loop: "{{ lvm_groups }}" loop_control: loop_var: vg - when: > - vg.rc != 0 - name: manage_lvm | unmounting filesystem(s) mount: - name: "{{ item[1]['mntp'] }}" - src: "/dev/{{ item[0]['vgname'] }}/{{ item[1]['lvname'] }}" - fstype: "{{ item[1]['filesystem'] | default(omit) }}" + name: "{{ item.1.mntp }}" + src: "/dev/{{ item.0.vgname }}/{{ item.1.lvname }}" + fstype: "{{ item.1.filesystem | default(omit) }}" state: "absent" become: true - with_subelements: - - "{{ lvm_groups }}" - - lvnames + loop: "{{ lvm_groups|subelements('lvnames') }}" when: > - (item[1] is defined and - item[1] != 'None') and - (item[1]['create'] is defined and - not item[1]['create'] and - item[1]['filesystem'] != "swap") - -- meta: flush_handlers + (item.1 is defined and + item.1 != 'None') and + (item.1.create is defined and + not item.1.create and + item.1.filesystem != "swap") - name: manage_lvm | mounting new filesystem(s) mount: - name: "{{ item[1]['mntp'] }}" - src: "/dev/{{ item[0]['vgname'] }}/{{ item[1]['lvname'] }}" - fstype: "{{ item[1]['filesystem'] }}" + name: "{{ item.1.mntp }}" + src: "/dev/{{ item.0.vgname }}/{{ item.1.lvname }}" + fstype: "{{ item.1.filesystem }}" state: "mounted" - opts: "{{ item[1]['mopts'] | default('defaults') }}" + opts: "{{ item.1.mopts | default('defaults') }}" become: true - with_subelements: - - "{{ lvm_groups }}" - - lvnames + loop: "{{ lvm_groups|subelements('lvnames') }}" when: > - ((item[0]['create'] is defined and - item[0]['create']) and - (item[1] is defined and - item[1] != 'None') and - (item[1]['create'] is defined and - item[1]['create']) and - (item[1]['mount'] is defined and - item[1]['mount'])) + ((item.0.create is defined and + item.0.create) and + (item.1 is defined and + item.1 != 'None') and + (item.1.create is defined and + item.1.create) and + (item.1.mount is defined and + item.1.mount)) - name: manage_lvm | Removing LVM logical volume(s) lvol: - vg: "{{ item[0]['vgname'] }}" - lv: "{{ item[1]['lvname'] }}" + vg: "{{ item.0.vgname }}" + lv: "{{ item.1.lvname }}" state: "absent" force: yes become: true - with_subelements: - - "{{ lvm_groups }}" - - lvnames + loop: "{{ lvm_groups|subelements('lvnames') }}" when: > - (item[1] is defined and - item[1] != 'None') and - (item[1]['create'] is defined and - not item[1]['create']) + (item.1 is defined and + item.1 != 'None') and + (item.1.create is defined and + not item.1.create) -- name: manage_lvm | Removing LVM physical volume group(s) +- name: manage_lvm | Removing LVM volume group(s) lvg: - vg: "{{ item['vgname'] }}" - pvs: "{{ item['disks']|join(',') }}" + vg: "{{ item.vgname }}" + pvs: "{{ item.disks | join(',') }}" state: "absent" become: true - with_items: "{{ lvm_groups }}" + loop: "{{ lvm_groups }}" when: > - item['create'] is defined and - not item['create'] + item.create is defined and + not item.create