ansible-core 2.15.4rc1__py3-none-any.whl → 2.16.0b2__py3-none-any.whl

ansible/modules/apt.py

@@ -20,15 +20,15 @@ version_added: "0.0.2"
 options:
   name:
     description:
-      - A list of package names, like C(foo), or package specifier with version, like C(foo=1.0) or C(foo>=1.0).
-        Name wildcards (fnmatch) like C(apt*) and version wildcards like C(foo=1.0*) are also supported.
+      - A list of package names, like V(foo), or package specifier with version, like V(foo=1.0) or V(foo>=1.0).
+        Name wildcards (fnmatch) like V(apt*) and version wildcards like V(foo=1.0*) are also supported.
     aliases: [ package, pkg ]
     type: list
     elements: str
   state:
     description:
-      - Indicates the desired package state. C(latest) ensures that the latest version is installed. C(build-dep) ensures the package build dependencies
-        are installed. C(fixed) attempt to correct a system with broken dependencies in place.
+      - Indicates the desired package state. V(latest) ensures that the latest version is installed. V(build-dep) ensures the package build dependencies
+        are installed. V(fixed) attempt to correct a system with broken dependencies in place.
     type: str
     default: present
     choices: [ absent, build-dep, latest, present, fixed ]
@@ -40,25 +40,25 @@ options:
     type: bool
   update_cache_retries:
     description:
-      - Amount of retries if the cache update fails. Also see I(update_cache_retry_max_delay).
+      - Amount of retries if the cache update fails. Also see O(update_cache_retry_max_delay).
     type: int
     default: 5
     version_added: '2.10'
   update_cache_retry_max_delay:
     description:
-      - Use an exponential backoff delay for each retry (see I(update_cache_retries)) up to this max delay in seconds.
+      - Use an exponential backoff delay for each retry (see O(update_cache_retries)) up to this max delay in seconds.
     type: int
     default: 12
     version_added: '2.10'
   cache_valid_time:
     description:
-      - Update the apt cache if it is older than the I(cache_valid_time). This option is set in seconds.
-      - As of Ansible 2.4, if explicitly set, this sets I(update_cache=yes).
+      - Update the apt cache if it is older than the O(cache_valid_time). This option is set in seconds.
+      - As of Ansible 2.4, if explicitly set, this sets O(update_cache=yes).
     type: int
     default: 0
   purge:
     description:
-     - Will force purging of configuration files if the module state is set to I(absent).
+     - Will force purging of configuration files if O(state=absent) or O(autoremove=yes).
     type: bool
     default: 'no'
   default_release:
@@ -68,13 +68,13 @@ options:
     type: str
   install_recommends:
     description:
-      - Corresponds to the C(--no-install-recommends) option for I(apt). C(true) installs recommended packages.  C(false) does not install
+      - Corresponds to the C(--no-install-recommends) option for I(apt). V(true) installs recommended packages.  V(false) does not install
         recommended packages. By default, Ansible will use the same defaults as the operating system. Suggested packages are never installed.
     aliases: [ install-recommends ]
     type: bool
   force:
     description:
-      - 'Corresponds to the C(--force-yes) to I(apt-get) and implies C(allow_unauthenticated: yes) and C(allow_downgrade: yes)'
+      - 'Corresponds to the C(--force-yes) to I(apt-get) and implies O(allow_unauthenticated=yes) and O(allow_downgrade=yes)'
       - "This option will disable checking both the packages' signatures and the certificates of the
         web servers they are downloaded from."
       - 'This option *is not* the equivalent of passing the C(-f) flag to I(apt-get) on the command line'
@@ -93,7 +93,7 @@ options:
   allow_unauthenticated:
     description:
       - Ignore if packages cannot be authenticated. This is useful for bootstrapping environments that manage their own apt-key setup.
-      - 'C(allow_unauthenticated) is only supported with state: I(install)/I(present)'
+      - 'O(allow_unauthenticated) is only supported with O(state): V(install)/V(present)'
     aliases: [ allow-unauthenticated ]
     type: bool
     default: 'no'
@@ -102,8 +102,9 @@ options:
     description:
       - Corresponds to the C(--allow-downgrades) option for I(apt).
       - This option enables the named package and version to replace an already installed higher version of that package.
-      - Note that setting I(allow_downgrade=true) can make this module behave in a non-idempotent way.
+      - Note that setting O(allow_downgrade=true) can make this module behave in a non-idempotent way.
       - (The task could end up with a set of packages that does not match the complete list of specified packages to install).
+      - 'O(allow_downgrade) is only supported by C(apt) and will be ignored if C(aptitude) is detected or specified.'
     aliases: [ allow-downgrade, allow_downgrades, allow-downgrades ]
     type: bool
     default: 'no'
@@ -141,14 +142,14 @@ options:
      version_added: "1.6"
   autoremove:
     description:
-      - If C(true), remove unused dependency packages for all module states except I(build-dep). It can also be used as the only option.
+      - If V(true), remove unused dependency packages for all module states except V(build-dep). It can also be used as the only option.
       - Previous to version 2.4, autoclean was also an alias for autoremove, now it is its own separate command. See documentation for further information.
     type: bool
     default: 'no'
     version_added: "2.1"
   autoclean:
     description:
-      - If C(true), cleans the local repository of retrieved package files that can no longer be downloaded.
+      - If V(true), cleans the local repository of retrieved package files that can no longer be downloaded.
     type: bool
     default: 'no'
     version_added: "2.4"
@@ -157,7 +158,7 @@ options:
       - Force the exit code of /usr/sbin/policy-rc.d.
       - For example, if I(policy_rc_d=101) the installed package will not trigger a service start.
       - If /usr/sbin/policy-rc.d already exists, it is backed up and restored after the package installation.
-      - If C(null), the /usr/sbin/policy-rc.d isn't created/changed.
+      - If V(null), the /usr/sbin/policy-rc.d isn't created/changed.
     type: int
     default: null
     version_added: "2.8"
@@ -170,8 +171,9 @@ options:
   fail_on_autoremove:
     description:
       - 'Corresponds to the C(--no-remove) option for C(apt).'
-      - 'If C(true), it is ensured that no packages will be removed or the task will fail.'
-      - 'C(fail_on_autoremove) is only supported with state except C(absent)'
+      - 'If V(true), it is ensured that no packages will be removed or the task will fail.'
+      - 'O(fail_on_autoremove) is only supported with O(state) except V(absent).'
+      - 'O(fail_on_autoremove) is only supported by C(apt) and will be ignored if C(aptitude) is detected or specified.'
     type: bool
     default: 'no'
     version_added: "2.11"
@@ -202,15 +204,15 @@ attributes:
     platform:
         platforms: debian
 notes:
-   - Three of the upgrade modes (C(full), C(safe) and its alias C(true)) required C(aptitude) up to 2.3, since 2.4 C(apt-get) is used as a fall-back.
+   - Three of the upgrade modes (V(full), V(safe) and its alias V(true)) required C(aptitude) up to 2.3, since 2.4 C(apt-get) is used as a fall-back.
    - In most cases, packages installed with apt will start newly installed services by default. Most distributions have mechanisms to avoid this.
      For example when installing Postgresql-9.5 in Debian 9, creating an excutable shell script (/usr/sbin/policy-rc.d) that throws
      a return code of 101 will stop Postgresql 9.5 starting up after install. Remove the file or remove its execute permission afterwards.
    - The apt-get commandline supports implicit regex matches here but we do not because it can let typos through easier
      (If you typo C(foo) as C(fo) apt-get would install packages that have "fo" in their name with a warning and a prompt for the user.
      Since we don't have warnings and prompts before installing we disallow this.Use an explicit fnmatch pattern if you want wildcarding)
-   - When used with a C(loop:) each package will be processed individually, it is much more efficient to pass the list directly to the I(name) option.
-   - When C(default_release) is used, an implicit priority of 990 is used. This is the same behavior as C(apt-get -t).
+   - When used with a C(loop:) each package will be processed individually, it is much more efficient to pass the list directly to the O(name) option.
+   - When O(default_release) is used, an implicit priority of 990 is used. This is the same behavior as C(apt-get -t).
    - When an exact version is specified, an implicit priority of 1001 is used.
 '''
 
@@ -314,6 +316,11 @@ EXAMPLES = '''
   ansible.builtin.apt:
     autoremove: yes
 
+- name: Remove dependencies that are no longer required and purge their configuration files
+  ansible.builtin.apt:
+    autoremove: yes
+    purge: true
+
 - name: Run the equivalent of "apt-get clean" as a separate step
   apt:
     clean: yes
@@ -365,7 +372,7 @@ import time
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.common.locale import get_best_parsable_locale
 from ansible.module_utils.common.respawn import has_respawned, probe_interpreters_for_module, respawn_module
-from ansible.module_utils._text import to_native, to_text
+from ansible.module_utils.common.text.converters import to_native, to_text
 from ansible.module_utils.six import PY3, string_types
 from ansible.module_utils.urls import fetch_file
 
@@ -1031,15 +1038,13 @@ def cleanup(m, purge=False, force=False, operation=None,
 
 def aptclean(m):
     clean_rc, clean_out, clean_err = m.run_command(['apt-get', 'clean'])
-    if m._diff:
-        clean_diff = parse_diff(clean_out)
-    else:
-        clean_diff = {}
+    clean_diff = parse_diff(clean_out) if m._diff else {}
+
     if clean_rc:
         m.fail_json(msg="apt-get clean failed", stdout=clean_out, rc=clean_rc)
     if clean_err:
         m.fail_json(msg="apt-get clean failed: %s" % clean_err, stdout=clean_out, rc=clean_rc)
-    return clean_out, clean_err
+    return (clean_out, clean_err, clean_diff)
 
 
 def upgrade(m, mode="yes", force=False, default_release=None,
@@ -1088,13 +1093,24 @@ def upgrade(m, mode="yes", force=False, default_release=None,
         force_yes = ''
 
     if fail_on_autoremove:
-        fail_on_autoremove = '--no-remove'
+        if apt_cmd == APT_GET_CMD:
+            fail_on_autoremove = '--no-remove'
+        else:
+            m.warn("APTITUDE does not support '--no-remove', ignoring the 'fail_on_autoremove' parameter.")
+            fail_on_autoremove = ''
     else:
         fail_on_autoremove = ''
 
     allow_unauthenticated = '--allow-unauthenticated' if allow_unauthenticated else ''
 
-    allow_downgrade = '--allow-downgrades' if allow_downgrade else ''
+    if allow_downgrade:
+        if apt_cmd == APT_GET_CMD:
+            allow_downgrade = '--allow-downgrades'
+        else:
+            m.warn("APTITUDE does not support '--allow-downgrades', ignoring the 'allow_downgrade' parameter.")
+            allow_downgrade = ''
+    else:
+        allow_downgrade = ''
 
     if apt_cmd is None:
         if use_apt_get:
@@ -1293,7 +1309,7 @@ def main():
     p = module.params
 
     if p['clean'] is True:
-        aptclean_stdout, aptclean_stderr = aptclean(module)
+        aptclean_stdout, aptclean_stderr, aptclean_diff = aptclean(module)
         # If there is nothing else to do exit. This will set state as
         #  changed based on if the cache was updated.
         if not p['package'] and not p['upgrade'] and not p['deb']:
@@ -1301,7 +1317,8 @@ def main():
                 changed=True,
                 msg=aptclean_stdout,
                 stdout=aptclean_stdout,
-                stderr=aptclean_stderr
+                stderr=aptclean_stderr,
+                diff=aptclean_diff
             )
 
     if p['upgrade'] == 'no':

ansible/modules/apt_key.py

@@ -32,7 +32,7 @@ notes:
     - As a sanity check, downloaded key id must match the one specified.
     - "Use full fingerprint (40 characters) key ids to avoid key collisions.
       To generate a full-fingerprint imported key: C(apt-key adv --list-public-keys --with-fingerprint --with-colons)."
-    - If you specify both the key id and the URL with C(state=present), the task can verify or add the key as needed.
+    - If you specify both the key id and the URL with O(state=present), the task can verify or add the key as needed.
     - Adding a new key requires an apt cache update (e.g. using the M(ansible.builtin.apt) module's update_cache option).
 requirements:
     - gpg
@@ -44,7 +44,7 @@ options:
             - The identifier of the key.
             - Including this allows check mode to correctly report the changed state.
             - If specifying a subkey's id be aware that apt-key does not understand how to remove keys via a subkey id.  Specify the primary key's id instead.
-            - This parameter is required when C(state) is set to C(absent).
+            - This parameter is required when O(state) is set to V(absent).
         type: str
     data:
         description:
@@ -76,7 +76,7 @@ options:
         default: present
     validate_certs:
         description:
-            - If C(false), SSL certificates for the target url will not be validated. This should only be used
+            - If V(false), SSL certificates for the target url will not be validated. This should only be used
               on personally controlled sites using self-signed certificates.
         type: bool
         default: 'yes'
@@ -174,7 +174,7 @@ import os
 # FIXME: standardize into module_common
 from traceback import format_exc
 
-from ansible.module_utils._text import to_native
+from ansible.module_utils.common.text.converters import to_native
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.common.locale import get_best_parsable_locale
 from ansible.module_utils.urls import fetch_url

ansible/modules/apt_repository.py

@@ -54,19 +54,19 @@ options:
         aliases: [ update-cache ]
     update_cache_retries:
         description:
-        - Amount of retries if the cache update fails. Also see I(update_cache_retry_max_delay).
+        - Amount of retries if the cache update fails. Also see O(update_cache_retry_max_delay).
         type: int
         default: 5
         version_added: '2.10'
     update_cache_retry_max_delay:
         description:
-        - Use an exponential backoff delay for each retry (see I(update_cache_retries)) up to this max delay in seconds.
+        - Use an exponential backoff delay for each retry (see O(update_cache_retries)) up to this max delay in seconds.
         type: int
         default: 12
         version_added: '2.10'
     validate_certs:
         description:
-            - If C(false), SSL certificates for the target repo will not be validated. This should only be used
+            - If V(false), SSL certificates for the target repo will not be validated. This should only be used
               on personally controlled sites using self-signed certificates.
         type: bool
         default: 'yes'
@@ -91,7 +91,7 @@ options:
               Without this library, the module does not work.
             - Runs C(apt-get install python-apt) for Python 2, and C(apt-get install python3-apt) for Python 3.
             - Only works with the system Python 2 or Python 3. If you are using a Python on the remote that is not
-               the system Python, set I(install_python_apt=false) and ensure that the Python apt library
+               the system Python, set O(install_python_apt=false) and ensure that the Python apt library
                for your Python version is installed some other way.
         type: bool
         default: true
@@ -182,7 +182,7 @@ import time
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.common.respawn import has_respawned, probe_interpreters_for_module, respawn_module
-from ansible.module_utils._text import to_native
+from ansible.module_utils.common.text.converters import to_native
 from ansible.module_utils.six import PY3
 from ansible.module_utils.urls import fetch_url
 

ansible/modules/assemble.py

@@ -17,7 +17,7 @@ description:
 - Assembles a configuration file from fragments.
 - Often a particular program will take a single configuration file and does not support a
   C(conf.d) style structure where it is easy to build up the configuration
-  from multiple sources. C(assemble) will take a directory of files that can be
+  from multiple sources. M(ansible.builtin.assemble) will take a directory of files that can be
   local or have already been transferred to the system, and concatenate them
   together to produce a destination file.
 - Files are assembled in string sorting order.
@@ -36,7 +36,7 @@ options:
     required: true
   backup:
     description:
-    - Create a backup file (if C(true)), including the timestamp information so
+    - Create a backup file (if V(true)), including the timestamp information so
       you can get the original file back if you somehow clobbered it
       incorrectly.
     type: bool
@@ -48,16 +48,16 @@ options:
     version_added: '1.4'
   remote_src:
     description:
-    - If C(false), it will search for src at originating/master machine.
-    - If C(true), it will go to the remote/target machine for the src.
+    - If V(false), it will search for src at originating/master machine.
+    - If V(true), it will go to the remote/target machine for the src.
     type: bool
     default: yes
     version_added: '1.4'
   regexp:
     description:
-    - Assemble files only if C(regex) matches the filename.
+    - Assemble files only if the given regular expression matches the filename.
     - If not set, all files are assembled.
-    - Every C(\) (backslash) must be escaped as C(\\) to comply to YAML syntax.
+    - Every V(\\) (backslash) must be escaped as V(\\\\) to comply to YAML syntax.
     - Uses L(Python regular expressions,https://docs.python.org/3/library/re.html).
     type: str
   ignore_hidden:
@@ -133,7 +133,7 @@ import tempfile
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six import b, indexbytes
-from ansible.module_utils._text import to_native
+from ansible.module_utils.common.text.converters import to_native
 
 
 def assemble_from_fragments(src_path, delimiter=None, compiled_regexp=None, ignore_hidden=False, tmpdir=None):

ansible/modules/assert.py

@@ -36,7 +36,7 @@ options:
     version_added: "2.7"
   quiet:
     description:
-      - Set this to C(true) to avoid verbose output.
+      - Set this to V(true) to avoid verbose output.
     type: bool
     default: no
     version_added: "2.8"

ansible/modules/async_status.py

@@ -23,8 +23,8 @@ options:
     required: true
   mode:
     description:
-    - If C(status), obtain the status.
-    - If C(cleanup), clean up the async job cache (by default in C(~/.ansible_async/)) for the specified job I(jid).
+    - If V(status), obtain the status.
+    - If V(cleanup), clean up the async job cache (by default in C(~/.ansible_async/)) for the specified job O(jid), without waiting for it to finish.
     type: str
     choices: [ cleanup, status ]
     default: status
@@ -70,6 +70,11 @@ EXAMPLES = r'''
   until: job_result.finished
   retries: 100
   delay: 10
+
+- name: Clean up async file
+  ansible.builtin.async_status:
+    jid: '{{ yum_sleeper.ansible_job_id }}'
+    mode: cleanup
 '''
 
 RETURN = r'''
@@ -79,12 +84,12 @@ ansible_job_id:
   type: str
   sample: '360874038559.4169'
 finished:
-  description: Whether the asynchronous job has finished (C(1)) or not (C(0))
+  description: Whether the asynchronous job has finished (V(1)) or not (V(0))
   returned: always
   type: int
   sample: 1
 started:
-  description: Whether the asynchronous job has started (C(1)) or not (C(0))
+  description: Whether the asynchronous job has started (V(1)) or not (V(0))
   returned: always
   type: int
   sample: 1
@@ -107,7 +112,7 @@ import os
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six import iteritems
-from ansible.module_utils._text import to_native
+from ansible.module_utils.common.text.converters import to_native
 
 
 def main():
@@ -124,8 +129,7 @@ def main():
     async_dir = module.params['_async_dir']
 
     # setup logging directory
-    logdir = os.path.expanduser(async_dir)
-    log_path = os.path.join(logdir, jid)
+    log_path = os.path.join(async_dir, jid)
 
     if not os.path.exists(log_path):
         module.fail_json(msg="could not find job", ansible_job_id=jid, started=1, finished=1)

ansible/modules/async_wrapper.py

@@ -20,7 +20,7 @@ import time
 import syslog
 import multiprocessing
 
-from ansible.module_utils._text import to_text, to_bytes
+from ansible.module_utils.common.text.converters import to_text, to_bytes
 
 PY3 = sys.version_info[0] == 3
 

ansible/modules/blockinfile.py

@@ -21,7 +21,7 @@ options:
   path:
     description:
     - The file to modify.
-    - Before Ansible 2.3 this option was only usable as I(dest), I(destfile) and I(name).
+    - Before Ansible 2.3 this option was only usable as O(dest), O(destfile) and O(name).
     type: path
     required: yes
     aliases: [ dest, destfile, name ]
@@ -34,24 +34,24 @@ options:
   marker:
     description:
     - The marker line template.
-    - C({mark}) will be replaced with the values in C(marker_begin) (default="BEGIN") and C(marker_end) (default="END").
+    - C({mark}) will be replaced with the values in O(marker_begin) (default="BEGIN") and O(marker_end) (default="END").
     - Using a custom marker without the C({mark}) variable may result in the block being repeatedly inserted on subsequent playbook runs.
     - Multi-line markers are not supported and will result in the block being repeatedly inserted on subsequent playbook runs.
-    - A newline is automatically appended by the module to C(marker_begin) and C(marker_end).
+    - A newline is automatically appended by the module to O(marker_begin) and O(marker_end).
     type: str
     default: '# {mark} ANSIBLE MANAGED BLOCK'
   block:
     description:
     - The text to insert inside the marker lines.
-    - If it is missing or an empty string, the block will be removed as if C(state) were specified to C(absent).
+    - If it is missing or an empty string, the block will be removed as if O(state) were specified to V(absent).
     type: str
     default: ''
     aliases: [ content ]
   insertafter:
     description:
-    - If specified and no begin/ending C(marker) lines are found, the block will be inserted after the last match of specified regular expression.
-    - A special value is available; C(EOF) for inserting the block at the end of the file.
-    - If specified regular expression has no matches, C(EOF) will be used instead.
+    - If specified and no begin/ending O(marker) lines are found, the block will be inserted after the last match of specified regular expression.
+    - A special value is available; V(EOF) for inserting the block at the end of the file.
+    - If specified regular expression has no matches, V(EOF) will be used instead.
     - The presence of the multiline flag (?m) in the regular expression controls whether the match is done line by line or with multiple lines.
       This behaviour was added in ansible-core 2.14.
     type: str
@@ -59,8 +59,8 @@ options:
     default: EOF
   insertbefore:
     description:
-    - If specified and no begin/ending C(marker) lines are found, the block will be inserted before the last match of specified regular expression.
-    - A special value is available; C(BOF) for inserting the block at the beginning of the file.
+    - If specified and no begin/ending O(marker) lines are found, the block will be inserted before the last match of specified regular expression.
+    - A special value is available; V(BOF) for inserting the block at the beginning of the file.
     - If specified regular expression has no matches, the block will be inserted at the end of the file.
     - The presence of the multiline flag (?m) in the regular expression controls whether the match is done line by line or with multiple lines.
       This behaviour was added in ansible-core 2.14.
@@ -79,22 +79,39 @@ options:
     default: no
   marker_begin:
     description:
-    - This will be inserted at C({mark}) in the opening ansible block marker.
+    - This will be inserted at C({mark}) in the opening ansible block O(marker).
     type: str
     default: BEGIN
     version_added: '2.5'
   marker_end:
     required: false
     description:
-    - This will be inserted at C({mark}) in the closing ansible block marker.
+    - This will be inserted at C({mark}) in the closing ansible block O(marker).
     type: str
     default: END
     version_added: '2.5'
+  append_newline:
+    required: false
+    description:
+    - Append a blank line to the inserted block, if this does not appear at the end of the file.
+    - Note that this attribute is not considered when C(state) is set to C(absent)
+    type: bool
+    default: no
+    version_added: '2.16'
+  prepend_newline:
+    required: false
+    description:
+    - Prepend a blank line to the inserted block, if this does not appear at the beginning of the file.
+    - Note that this attribute is not considered when C(state) is set to C(absent)
+    type: bool
+    default: no
+    version_added: '2.16'
 notes:
   - When using 'with_*' loops be aware that if you do not set a unique mark the block will be overwritten on each iteration.
-  - As of Ansible 2.3, the I(dest) option has been changed to I(path) as default, but I(dest) still works as well.
-  - Option I(follow) has been removed in Ansible 2.5, because this module modifies the contents of the file so I(follow=no) doesn't make sense.
-  - When more then one block should be handled in one file you must change the I(marker) per task.
+  - As of Ansible 2.3, the O(dest) option has been changed to O(path) as default, but O(dest) still works as well.
+  - Option O(ignore:follow) has been removed in Ansible 2.5, because this module modifies the contents of the file
+    so O(ignore:follow=no) does not make sense.
+  - When more then one block should be handled in one file you must change the O(marker) per task.
 extends_documentation_fragment:
     - action_common_attributes
     - action_common_attributes.files
@@ -116,9 +133,11 @@ attributes:
 
 EXAMPLES = r'''
 # Before Ansible 2.3, option 'dest' or 'name' was used instead of 'path'
-- name: Insert/Update "Match User" configuration block in /etc/ssh/sshd_config
+- name: Insert/Update "Match User" configuration block in /etc/ssh/sshd_config prepending and appending a new line
   ansible.builtin.blockinfile:
     path: /etc/ssh/sshd_config
+    append_newline: true
+    prepend_newline: true
     block: |
       Match User ansible-agent
       PasswordAuthentication no
@@ -179,7 +198,7 @@ import os
 import tempfile
 from ansible.module_utils.six import b
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils._text import to_bytes, to_native
+from ansible.module_utils.common.text.converters import to_bytes, to_native
 
 
 def write_changes(module, contents, path):
@@ -230,6 +249,8 @@ def main():
             validate=dict(type='str'),
             marker_begin=dict(type='str', default='BEGIN'),
             marker_end=dict(type='str', default='END'),
+            append_newline=dict(type='bool', default=False),
+            prepend_newline=dict(type='bool', default=False),
         ),
         mutually_exclusive=[['insertbefore', 'insertafter']],
         add_file_common_args=True,
@@ -251,8 +272,10 @@ def main():
         if not os.path.exists(destpath) and not module.check_mode:
             try:
                 os.makedirs(destpath)
+            except OSError as e:
+                module.fail_json(msg='Error creating %s Error code: %s Error description: %s' % (destpath, e.errno, e.strerror))
             except Exception as e:
-                module.fail_json(msg='Error creating %s Error code: %s Error description: %s' % (destpath, e[0], e[1]))
+                module.fail_json(msg='Error creating %s Error: %s' % (destpath, to_native(e)))
         original = None
         lines = []
     else:
@@ -273,6 +296,7 @@ def main():
     block = to_bytes(params['block'])
     marker = to_bytes(params['marker'])
     present = params['state'] == 'present'
+    blank_line = [b(os.linesep)]
 
     if not present and not path_exists:
         module.exit_json(changed=False, msg="File %s not present" % path)
@@ -336,7 +360,26 @@ def main():
         if not lines[n0 - 1].endswith(b(os.linesep)):
             lines[n0 - 1] += b(os.linesep)
 
+    # Before the block: check if we need to prepend a blank line
+    # If yes, we need to add the blank line if we are not at the beginning of the file
+    # and the previous line is not a blank line
+    # In both cases, we need to shift by one on the right the inserting position of the block
+    if params['prepend_newline'] and present:
+        if n0 != 0 and lines[n0 - 1] != b(os.linesep):
+            lines[n0:n0] = blank_line
+            n0 += 1
+
+    # Insert the block
     lines[n0:n0] = blocklines
+
+    # After the block: check if we need to append a blank line
+    # If yes, we need to add the blank line if we are not at the end of the file
+    # and the line right after is not a blank line
+    if params['append_newline'] and present:
+        line_after_block = n0 + len(blocklines)
+        if line_after_block < len(lines) and lines[line_after_block] != b(os.linesep):
+            lines[line_after_block:line_after_block] = blank_line
+
     if lines:
         result = b''.join(lines)
     else: