wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix lvg module idempotency

Browse source 
In [1] changes were made to ensure that the physical
devices were appropriately filtered, but the dev_list
which is used to prepare the filter is modified from
the original arguments to resolve any symlinks. This
results in the existing devices given in the module
args to be left out of the filter, resulting
in the module trying to add the same device again
every time the task is executed.

In this PR we change dev_list to be a copy of the
module arguments so that we're able to add the given
pv list from the module arguments into the filter
as well, ensuring that there is idempotence when
running the task again.

[1] https://github.com/ansible/ansible/pull/38446

(cherry picked from commit 1bae00b5d26816b3298e2363a5d1c3fe9f945865)
This commit is contained in:
Jesse Pretorius 2018-10-25 17:10:22 +01:00 committed by Matt Clay
parent a08aa35831
commit 4e402cf07b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/system/lvg.py
View file

@ -150,7 +150,7 @@ def main():
dev_list = []
if module.params['pvs']:
dev_list = module.params['pvs']
dev_list = list(module.params['pvs'])
elif state == 'present':
module.fail_json(msg="No physical volumes given.")
@ -167,7 +167,7 @@ def main():
# get pv list
pvs_cmd = module.get_bin_path('pvs', True)
if dev_list:
pvs_filter = ' || '. join(['pv_name = {0}'.format(x) for x in dev_list])
pvs_filter = ' || '. join(['pv_name = {0}'.format(x) for x in dev_list + module.params['pvs']])
pvs_filter = "--select '%s'" % pvs_filter
else:
pvs_filter = ''