Merge 5118f2da78 into af870d0b83

changelogs/fragments/504-firewalld_info-warning.yaml

@@ -1,2 +0,0 @@
-minor_changes:
-  - firewalld_info - Only warn about ignored zones, when there are zones ignored.

plugins/callback/profile_roles.py

@@ -26,7 +26,7 @@ DOCUMENTATION = '''
         ini:
           - section: callback_profile_roles
             key: summary_only
-        version_added: 1.5.0
+        version_added: '1.5.5'
 '''
 
 import collections

plugins/callback/profile_tasks.py

@@ -51,7 +51,7 @@ DOCUMENTATION = '''
         ini:
           - section: callback_profile_tasks
             key: summary_only
-        version_added: 1.5.0
+        version_added: '1.5.5'
 '''
 
 EXAMPLES = '''

plugins/modules/firewalld_info.py

@@ -356,7 +356,6 @@ def main():
             specified_zones = module.params['zones']
             collect_zones = list(set(specified_zones) & set(all_zones))
             ignore_zones = list(set(specified_zones) - set(collect_zones))
-            if ignore_zones:
             warn.append(
                 'Please note: zone:(%s) have been ignored in the gathering process.' % ','.join(ignore_zones))
         else:

plugins/modules/mount.py

@@ -831,7 +831,7 @@ def main():
         # handle mount on boot.  To avoid mount option conflicts, if 'noauto'
         # specified in 'opts',  mount module will ignore 'boot'.
         opts = args['opts'].split(',')
-        if module.params['boot'] and 'noauto' in opts:
+        if 'noauto' in opts:
             args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'noauto'.")
         elif not module.params['boot']:
             args['boot'] = 'no'