Correct conditional logic, libvirt-volume creation

Change-Id: I3941518ea8d0a971e15a208785a89812801e1a50

roles/libvirt-volume/tasks/create.yml

@@ -3,13 +3,11 @@
     image_scheme: "{{ libvirt_volume.image | urlsplit('scheme') }}"
   when: "libvirt_volume.image is defined"
 
-
 - name: Get Scheme
   set_fact:
     image_dest: "{{ libvirt_image_cache_path }}/{{ libvirt_volume.image | basename }}"
   when: "libvirt_volume.image is defined"
 
-
 - name: Ensure cache directories exist
   file:
     path: "{{ libvirt_image_cache_path }}"
@@ -20,13 +18,18 @@
     url: "{{ libvirt_volume.image }}"
     dest: "{{ image_dest }}"
     checksum: "{{ libvirt_volume.checksum | default(omit) }}"
-  when: "image_scheme in libvirt_remote_scheme_list and libvirt_volume.image is defined"
+  when:
+    - libvirt_volume.image is defined
+    - image_scheme is defined
+    - image_scheme in libvirt_remote_scheme_list
 
 - name: Ensure local images are copied
   copy:
     src: "{{ libvirt_volume.image }}"
     dest: "{{ image_dest }}"
-  when: "image_scheme not in libvirt_remote_scheme_list and libvirt_volume.image is defined"
+  when:
+    - libvirt_volume.image is defined
+    - image_scheme not in libvirt_remote_scheme_list
 
 - name: "Create volume"
   command: >-
@@ -37,10 +40,11 @@
   register: libvirt_create_volume
   failed_when:
     - "libvirt_create_volume.rc != 0"
-    - "'Failed to create vol' in libvirt_create_volume.stdout"
+    - "'exists already' not in libvirt_create_volume.stderr"
     - "'exists already' not in libvirt_create_volume.stdout"
   changed_when:
     - "libvirt_create_volume.rc != 1"
+    - "'exists already' not in libvirt_create_volume.stderr"
     - "'exists already' not in libvirt_create_volume.stdout"
 
 - name: "Upload volume from downloaded image"