Revert "Performance: skip LVM configuration if no groups configured"

The reverted change relies on the apply parameter for the include_role
playbook, which was introduced in Ansible 2.7. Requirements for the
Train release allow Ansible 2.6, which produces the following error:

    ERROR! Invalid options for include_role: apply

This reverts commit 5fd45d67de.

Change-Id: I33d2b8ea08903d558e2a42231de48edc6567cadf
Story: 2008753
Task: 42114
This commit is contained in:
Pierre Riteau 2021-03-26 15:52:30 +01:00
parent 67103fb5d7
commit c12192c18a
1 changed files with 5 additions and 10 deletions

View File

@ -4,7 +4,7 @@
tags:
- lvm
- upgrade-check
tasks:
pre_tasks:
- name: Fail if the LVM physical disks have not been configured
fail:
msg: >
@ -13,7 +13,6 @@
has a valid 'disks' list.
with_items: "{{ lvm_groups | default([]) }}"
when: not item.disks | default([]) or 'changeme' in item.disks | default([])
- name: Fail if the LVM physical disks are configured as a comma-separated string
fail:
msg: >
@ -22,14 +21,10 @@
each volume group in 'lvm_groups' has a valid 'disks' list.
with_items: "{{ lvm_groups | default([]) }}"
when: item.disks | string() == item.disks
- name: Ensure LVM configuration is applied
vars:
manage_lvm: True
include_role:
name: mrlesmithjr.manage-lvm
apply:
become: True
roles:
- role: mrlesmithjr.manage-lvm
manage_lvm: True
become: True
when:
- lvm_groups is defined
- lvm_groups | length > 0