mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-01-13 08:05:19 +01:00
Compare commits
3 commits
dc2773c330
...
1da58f2a24
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1da58f2a24 | ||
|
|
0847977d12 | ||
|
|
2a1fb334ee |
3 changed files with 6 additions and 3 deletions
2
changelogs/fragments/504-firewalld_info-warning.yaml
Normal file
2
changelogs/fragments/504-firewalld_info-warning.yaml
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
minor_changes:
|
||||||
|
- firewalld_info - Only warn about ignored zones, when there are zones ignored.
|
||||||
|
|
@ -356,6 +356,7 @@ def main():
|
||||||
specified_zones = module.params['zones']
|
specified_zones = module.params['zones']
|
||||||
collect_zones = list(set(specified_zones) & set(all_zones))
|
collect_zones = list(set(specified_zones) & set(all_zones))
|
||||||
ignore_zones = list(set(specified_zones) - set(collect_zones))
|
ignore_zones = list(set(specified_zones) - set(collect_zones))
|
||||||
|
if ignore_zones:
|
||||||
warn.append(
|
warn.append(
|
||||||
'Please note: zone:(%s) have been ignored in the gathering process.' % ','.join(ignore_zones))
|
'Please note: zone:(%s) have been ignored in the gathering process.' % ','.join(ignore_zones))
|
||||||
else:
|
else:
|
||||||
|
|
|
||||||
|
|
@ -831,7 +831,7 @@ def main():
|
||||||
# handle mount on boot. To avoid mount option conflicts, if 'noauto'
|
# handle mount on boot. To avoid mount option conflicts, if 'noauto'
|
||||||
# specified in 'opts', mount module will ignore 'boot'.
|
# specified in 'opts', mount module will ignore 'boot'.
|
||||||
opts = args['opts'].split(',')
|
opts = args['opts'].split(',')
|
||||||
if 'noauto' in opts:
|
if module.params['boot'] and 'noauto' in opts:
|
||||||
args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'noauto'.")
|
args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'noauto'.")
|
||||||
elif not module.params['boot']:
|
elif not module.params['boot']:
|
||||||
args['boot'] = 'no'
|
args['boot'] = 'no'
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue