internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-03-26 21:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

zfs: avoid errors with creation-only properties (#1833)

Browse Source 
* avoid errors with creation-only properties

* add changelog fragment

* Apply suggestion to changelog fragment

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
sam-lunt
2021-03-04 00:47:45 -06:00
committed by GitHub
parent ad8aa1b1e6
commit ce5aea790d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/1833-zfs-creation-only-properties.yaml Normal file
View File

@@ -0,0 +1,2 @@
bugfixes:
- zfs - some ZFS properties could be passed when the dataset/volume did not exist, but would fail if the dataset already existed, even if the property matched what was specified in the ansible task (https://github.com/ansible-collections/community.general/issues/868, https://github.com/ansible-collections/community.general/pull/1833).

5
plugins/modules/storage/zfs/zfs.py
View File

@@ -203,7 +203,10 @@ class Zfs(object):
rc, out, err = self.module.run_command(" ".join(cmd))
properties = dict()
for prop, value, source in [l.split('\t')[1:4] for l in out.splitlines()]:
if source == 'local':
# include source '-' so that creation-only properties are not removed
# to avoids errors when the dataset already exists and the property is not changed
# this scenario is most likely when the same playbook is run more than once
if source == 'local' or source == '-':
properties[prop] = value
# Add alias for enhanced sharing properties
if self.enhanced_sharing: