From 80b4efab8a60ec8fc563116cba8c435d429d4287 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 15 Jun 2018 16:41:22 +0100 Subject: [PATCH] MNAIO: Use file instead of command for disk image clean-up Rather than use the command module, we use the file module which is idempotent. We also remove the conditional for the clean up so that it's easier to switch between back-ends and still have the clean-up happen. Change-Id: I5d77bbd236d1cb7d45bc4dda4206475b5663b1c0 --- multi-node-aio/playbooks/deploy-vms.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/multi-node-aio/playbooks/deploy-vms.yml b/multi-node-aio/playbooks/deploy-vms.yml index 3ddfeee8..d6063c7b 100644 --- a/multi-node-aio/playbooks/deploy-vms.yml +++ b/multi-node-aio/playbooks/deploy-vms.yml @@ -45,16 +45,14 @@ failed_when: false when: - hostvars[item]['server_vm'] | default(false) | bool - - default_vm_disk_mode | default('lvm') == "lvm" with_items: "{{ groups['pxe_servers'] }}" - name: Delete VM Disk Image - command: | - rm -f /var/lib/libvirt/images/{{ hostvars[item]['server_hostname'] }}.img - failed_when: false + file: + path: "/var/lib/libvirt/images/{{ hostvars[item]['server_hostname'] }}.img" + state: absent when: - hostvars[item]['server_vm'] | default(false) | bool - - default_vm_disk_mode | default('lvm') == "file" with_items: "{{ groups['pxe_servers'] }}" - name: Create VM LV