crypto: Fix known issues in modules (#52302)

* crypto: Fix known issues in modules

This fixes a few issues reported by 'validate-modules'.

* Fix whitespace

lib/ansible/modules/crypto/openssl_dhparam.py

@@ -1,80 +1,85 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-# (c) 2017, Thom Wiggers  <ansible@thomwiggers.nl>
+# Copyright: (c) 2017, Thom Wiggers  <ansible@thomwiggers.nl>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-
 ANSIBLE_METADATA = {'metadata_version': '1.1',
                     'status': ['preview'],
                     'supported_by': 'community'}
 
-
-DOCUMENTATION = '''
+DOCUMENTATION = r'''
 ---
 module: openssl_dhparam
-author: "Thom Wiggers (@thomwiggers)"
 version_added: "2.5"
 short_description: Generate OpenSSL Diffie-Hellman Parameters
 description:
-    - "This module allows one to (re)generate OpenSSL DH-params.
-      This module uses file common arguments to specify generated file permissions."
+    - This module allows one to (re)generate OpenSSL DH-params.
+    - This module uses file common arguments to specify generated file permissions.
 requirements:
     - OpenSSL
+author:
+- Thom Wiggers (@thomwiggers)
 options:
     state:
-        required: false
-        default: "present"
-        choices: [ present, absent ]
         description:
             - Whether the parameters should exist or not,
               taking action if the state is different from what is stated.
+        type: str
+        choices: [ absent, present ]
+        default: present
     size:
-        required: false
+        description:
+            - Size (in bits) of the generated DH-params.
+        type: int
         default: 4096
-        description:
-            - Size (in bits) of the generated DH-params
     force:
-        required: false
-        default: False
-        type: bool
         description:
-            - Should the parameters be regenerated even it it already exists
+            - Should the parameters be regenerated even it it already exists.
+        type: bool
+        default: no
     path:
-        required: true
         description:
             - Name of the file in which the generated parameters will be saved.
-extends_documentation_fragment: files
+        type: path
+        required: true
+extends_documentation_fragment:
+- files
+seealso:
+- module: openssl_certificate
+- module: openssl_csr
+- module: openssl_pkcs12
+- module: openssl_privatekey
+- module: openssl_publickey
 '''
 
-EXAMPLES = '''
-# Generate Diffie-Hellman parameters with the default size (4096 bits)
-- openssl_dhparam:
+EXAMPLES = r'''
+- name: Generate Diffie-Hellman parameters with the default size (4096 bits)
+  openssl_dhparam:
     path: /etc/ssl/dhparams.pem
 
-# Generate DH Parameters with a different size (2048 bits)
-- openssl_dhparam:
+- name: Generate DH Parameters with a different size (2048 bits)
+  openssl_dhparam:
     path: /etc/ssl/dhparams.pem
     size: 2048
 
-# Force regenerate an DH parameters if they already exist
-- openssl_dhparam:
+- name: Force regenerate an DH parameters if they already exist
+  openssl_dhparam:
     path: /etc/ssl/dhparams.pem
-    force: True
-
+    force: yes
 '''
 
-RETURN = '''
+RETURN = r'''
 size:
-    description: Size (in bits) of the Diffie-Hellman parameters
+    description: Size (in bits) of the Diffie-Hellman parameters.
     returned: changed or success
     type: int
     sample: 4096
 filename:
-    description: Path to the generated Diffie-Hellman parameters
+    description: Path to the generated Diffie-Hellman parameters.
     returned: changed or success
     type: str
     sample: /etc/ssl/dhparams.pem
@@ -97,7 +102,7 @@ class DHParameter(object):
     def __init__(self, module):
         self.state = module.params['state']
         self.path = module.params['path']
-        self.size = int(module.params['size'])
+        self.size = module.params['size']
         self.force = module.params['force']
         self.changed = False
         self.openssl_bin = module.get_bin_path('openssl', True)
@@ -150,8 +155,8 @@ class DHParameter(object):
         match = re.search(r"Parameters:\s+\((\d+) bit\).*", result)
         if not match:
             return False  # No "xxxx bit" in output
-        else:
-            bits = int(match.group(1))
+
+        bits = int(match.group(1))
 
         # if output contains "WARNING" we've got a problem
         if "WARNING" in result or "WARNING" in to_native(err):
@@ -182,10 +187,10 @@ def main():
 
     module = AnsibleModule(
         argument_spec=dict(
-            state=dict(default='present', choices=['present', 'absent'], type='str'),
-            size=dict(default=4096, type='int'),
-            force=dict(default=False, type='bool'),
-            path=dict(required=True, type='path'),
+            state=dict(type='str', default='present', choices=['absent', 'present']),
+            size=dict(type='int', default=4096),
+            force=dict(type='bool', default=False),
+            path=dict(type='path', required=True),
         ),
         supports_check_mode=True,
         add_file_common_args=True,
@@ -195,7 +200,7 @@ def main():
     if not os.path.isdir(base_dir):
         module.fail_json(
             name=base_dir,
-            msg='The directory %s does not exist or the file is not a directory' % base_dir
+            msg="The directory '%s' does not exist or the file is not a directory" % base_dir
         )
 
     dhparam = DHParameter(module)