diff --git a/plugins/module_utils/ansible_freeipa_module.py b/plugins/module_utils/ansible_freeipa_module.py index f1f84ccf39e0a2ec3a4be0d658fd448d83c9c4da..8b2c9f8f4af3c252f299df9920e99b3bc2500fe6 100644 --- a/plugins/module_utils/ansible_freeipa_module.py +++ b/plugins/module_utils/ansible_freeipa_module.py @@ -226,7 +226,7 @@ def temp_kdestroy(ccache_dir, ccache_name): """Destroy temporary ticket and remove temporary ccache.""" if ccache_name is not None: run([paths.KDESTROY, '-c', ccache_name], raiseonerr=False) - del os.environ['KRB5CCNAME'] + os.environ.pop('KRB5CCNAME', None) if ccache_dir is not None: shutil.rmtree(ccache_dir, ignore_errors=True) diff --git a/roles/ipaclient/library/ipaclient_fix_ca.py b/roles/ipaclient/library/ipaclient_fix_ca.py index ede8d56d04510dd5ff12a9de2c17cbce243302fa..61877f2b18f5146832391ef62fc42ece4d04e5b7 100644 --- a/roles/ipaclient/library/ipaclient_fix_ca.py +++ b/roles/ipaclient/library/ipaclient_fix_ca.py @@ -132,7 +132,7 @@ def main(): else: get_ca_certs(fstore, options, servers[0], basedn, realm) changed = True - del os.environ['KRB5_CONFIG'] + os.environ.pop('KRB5_CONFIG', None) except errors.FileError as e: module.fail_json(msg='%s' % e) except Exception as e: diff --git a/roles/ipaclient/library/ipaclient_get_otp.py b/roles/ipaclient/library/ipaclient_get_otp.py index b69a30cff187d10c8af9476160565e4c86d61ca8..d0642eb6464260d957bc6aae2b477e91f18d68f1 100644 --- a/roles/ipaclient/library/ipaclient_get_otp.py +++ b/roles/ipaclient/library/ipaclient_get_otp.py @@ -123,7 +123,7 @@ def temp_kdestroy(ccache_dir, ccache_name): """Destroy temporary ticket and remove temporary ccache.""" if ccache_name is not None: run([paths.KDESTROY, '-c', ccache_name], raiseonerr=False) - del os.environ['KRB5CCNAME'] + os.environ.pop('KRB5CCNAME', None) if ccache_dir is not None: shutil.rmtree(ccache_dir, ignore_errors=True) diff --git a/roles/ipaclient/library/ipaclient_join.py b/roles/ipaclient/library/ipaclient_join.py index afa722f62b9e38e4bd79fe8621b275bc04f0cefa..e7aae43ce988e4358df7fccaf434daae03f4d0ee 100644 --- a/roles/ipaclient/library/ipaclient_join.py +++ b/roles/ipaclient/library/ipaclient_join.py @@ -272,7 +272,7 @@ def main(): get_ca_cert(fstore, options, servers[0], basedn) else: get_ca_certs(fstore, options, servers[0], basedn, realm) - del os.environ['KRB5_CONFIG'] + os.environ.pop('KRB5_CONFIG', None) except errors.FileError as e: module.fail_json(msg='%s' % e) except Exception as e: diff --git a/roles/ipareplica/library/ipareplica_prepare.py b/roles/ipareplica/library/ipareplica_prepare.py index 9ab59b2247b3bb1d274f7fb7b0b1afae1db304c3..962432407259695bca239fb4e1bcc65bc3a0d734 100644 --- a/roles/ipareplica/library/ipareplica_prepare.py +++ b/roles/ipareplica/library/ipareplica_prepare.py @@ -669,7 +669,7 @@ def main(): raise errors.ACIError(info="Not authorized") if installer._ccache is None: - del os.environ['KRB5CCNAME'] + os.environ.pop('KRB5CCNAME', None) else: os.environ['KRB5CCNAME'] = installer._ccache @@ -873,7 +873,7 @@ def main(): if add_to_ipaservers: # use user's credentials when the server host is not ipaservers if installer._ccache is None: - del os.environ['KRB5CCNAME'] + os.environ.pop('KRB5CCNAME', None) else: os.environ['KRB5CCNAME'] = installer._ccache diff --git a/roles/ipaserver/library/ipaserver_get_connected_server.py b/roles/ipaserver/library/ipaserver_get_connected_server.py index 910104bbb4d516bf6e1971002f64700ad2fed5f3..c77144fdd784e844f9fed53d5ebe15ce79d8181d 100644 --- a/roles/ipaserver/library/ipaserver_get_connected_server.py +++ b/roles/ipaserver/library/ipaserver_get_connected_server.py @@ -108,7 +108,7 @@ def temp_kdestroy(ccache_dir, ccache_name): """Destroy temporary ticket and remove temporary ccache.""" if ccache_name is not None: run([paths.KDESTROY, '-c', ccache_name], raiseonerr=False) - del os.environ['KRB5CCNAME'] + os.environ.pop('KRB5CCNAME', None) if ccache_dir is not None: shutil.rmtree(ccache_dir, ignore_errors=True)