Merge pull request #2 from timflannagan1/install-commands

Update installation tasks to speed up playbook execution

Author: dwlehman

defaults/main.yml

@@ -3,7 +3,6 @@
 storage_backend: "default"
 pool_layers: ["pool-partitions", "vg"]  # md, luks, vdo under vg
 volume_layers: ["partition", "lv", "fs", "mount"]  # luks under fs
-
 use_partitions: false
 disklabel_type: gpt
 

tasks/fs-default.yml

@@ -6,19 +6,30 @@
   package:
     name: xfsprogs
     state: present
-  when: volume.fs_type == "xfs" and not ansible_check_mode
+  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 is defined and pool.state in 'present') or volume.state in 'present')"
 
 - name: Install e2fsprogs for ext file system type
   package:
     name: e2fsprogs
     state: present
-  when: volume.fs_type in ["ext2", "ext3", "ext4"]
+  register: e2fsprogs_installed
+  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 is defined and pool.state in 'present') or volume.state in 'present')"
 
 - name: Install util-linux as needed
   package:
     name: util-linux
     state: present
-  when: volume.fs_type == "swap" or volume.state == "absent" or (pool.state is defined and pool.state == "absent")
+  register: util_linux_installed
+  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
   mount:

tasks/lv-default.yml

@@ -1,9 +1,16 @@
 ---
-- name: Install LVM2 commands as needed
-  package:
-    name: lvm2
-    state: present
-  when: volume.type == "lvm"
+- block:
+    - name: Install LVM2 commands as needed
+      package:
+        name: lvm2
+        state: present
+    - name: Run the setup module to use ansible_facts.lvm
+      setup:
+    - name: Ensure the setup module runs above by setting a flag that lvm was installed
+      set_fact:
+        lvm_installed: true
+  when: "volume.type == 'lvm' and (['lvm2'] is not subset(ansible_facts.packages.keys()) and \
+         lvm_installed is undefined) and not ansible_check_mode"
 
 - name: Make sure LV exists
   lvol:
@@ -13,4 +20,4 @@
     state: "{{ volume.state if pool.state != 'absent' else pool.state }}"
     force: yes
     shrink: no
-  when: volume.type == "lvm" and pool.name
+  when: volume.type == "lvm" and ansible_facts.lvm is defined and pool.name

tasks/main.yml

@@ -1,4 +1,7 @@
 ---
+- name: get a list of rpm packages installed on host machine
+  package_facts:
+    manager: "auto"
 
 - name: manage pools
   include_tasks: pool-{{ storage_backend }}.yml

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

tasks/pool-default.yml

@@ -39,7 +39,7 @@
 - name: see if pool already exists
   set_fact:
     pool: "{{ pool|combine({'_preexist': pool.name in ansible_facts.lvm.vgs}) }}"
-  when: pool.type == "lvm"
+  when: ansible_facts.lvm is defined and pool.type == "lvm"
 
 #
 # XXX This is only going to remove fstab entries etc. for volumes explicitly listed.

tasks/pool-partition-default.yml

@@ -1,4 +1,12 @@
 ---
+- name: Install parted for partition management
+  package:
+    name: parted
+    state: present
+  register: parted_installed
+  # update this condition when current use_partitions issue (#5) is fixed.
+  when: "use_partitions and ['parted'] is not subset(ansible_facts.packages.keys()) \
+         and parted_installed is undefined and not ansible_check_mode"
 
 - block:
   - name: set up partition parameters

tasks/vg-default.yml

@@ -4,12 +4,19 @@
 #
 # TODO: Decide on semantics. Playbook PV specs should probably be complete to enable idempotency.
 #
-- name: Install LVM2 commmands as needed
-  package:
-    name: lvm2
-    state: present
-  when: pool.type == "lvm"
-  
+- block:
+    - name: Install LVM2 commands as needed
+      package:
+        name: lvm2
+        state: present
+    - name: Run the setup module to use ansible_facts.lvm
+      setup:
+    - name: Ensure the setup module runs above by setting a flag that lvm was installed
+      set_fact:
+        lvm_installed: true
+  when: "pool.type == 'lvm' and (['lvm2'] is not subset(ansible_facts.packages.keys()) and \
+        lvm_installed is undefined) and not ansible_check_mode"
+
 - block:
     - name: collect list of current pvs
       command: pvs -o name --noheadings --select 'vg_name={{ pool.name }}'
@@ -40,12 +47,13 @@
   rescue:
     - debug:
         msg: "Failed to run pvs"
-  when: pool.type == "lvm" and pool.name in ansible_facts.lvm.vgs
+  when: pool.type == "lvm" and ansible_facts.lvm is defined and pool.name in ansible_facts.lvm.vgs
 
 - name: Set pvs from current vg
   set_fact:
     pool: "{{ pool|combine({'_orig_members': pvs_cmd.stdout.split()}) }}"
-  when: pool.type == "lvm" and pool.name in ansible_facts.lvm.vgs and not pvs_cmd.failed
+  when: "pool.type == 'lvm' and ansible_facts.lvm is defined and pool.name in \
+        ansible_facts.lvm.vgs and not pvs_cmd.failed and not ansible_check_mode"
 
 #
 # Configure the VG