Check whether pool variable is defined to relevant conditionals when storage_pools is undefined.

Previously, if the playbook was run with just storage_volumes defined then various installation and mount tasks would fail in fs-default.yml and mount-default.yml, respectively.

Author: timflannagan

tasks/fs-default.yml

@@ -9,7 +9,7 @@
   register: xfsprogs_installed
   when: "volume.fs_type == 'xfs' and ['xfsprogs'] is not subset(ansible_facts.packages.keys()) \
          and xfsprogs_installed is undefined and not ansible_check_mode \
-         and (pool.state in 'present' and volume.state in 'present')"
+         and ((pool is defined and pool.state in 'present') or volume.state in 'present')"
 
 - name: Install e2fsprogs for ext file system type
   package:
@@ -19,16 +19,16 @@
   when: "volume.fs_type in ['ext2', 'ext3', 'ext4'] and \
          ['e2fsprogs'] is not subset(ansible_facts.packages.keys()) and \
          e2fsprogs_installed is undefined and not ansible_check_mode \
-         and (pool.state in 'present' and volume.state in 'present')"
+         and ((pool is defined and pool.state in 'present') or volume.state in 'present')"
 
 - name: Install util-linux as needed
   package:
     name: util-linux
     state: present
   register: util_linux_installed
-  when: "(volume.fs_type == 'swap' or volume.state == 'absent' or \
-         (pool.state is defined and pool.state == 'absent')) and \
-         ['util-linux'] is not subset(ansible_facts.packages.keys()) and \
+  when: "(volume.fs_type == 'swap' or volume.state == 'absent' or
+         (pool is defined and pool.state is defined and pool.state == 'absent'))
+         and ['util-linux'] is not subset(ansible_facts.packages.keys()) and
          util_linux_installed is undefined and not ansible_check_mode"
 
 - name: unmount fs if we're going to reformat

tasks/mount-default.yml

@@ -29,7 +29,7 @@
 - name: configure mount state (2/2)
   set_fact:
     mount_state: "{{ pool.state }}"
-  when: pool.state is defined and pool.state == "absent"
+  when: pool is defined and pool.state is defined and pool.state == "absent"
 
 # Set up the mount using a stable device identifier.
 - name: Set up the mount