diff --git a/roles/ipaserver/library/ipaserver_prepare.py b/roles/ipaserver/library/ipaserver_prepare.py
index ac6d3ce5cfff6416e59fc027434dbbbd1f71c574..b9f1da2b9bff62cbf7b44acd1977100fd70aa1d6 100644
--- a/roles/ipaserver/library/ipaserver_prepare.py
+++ b/roles/ipaserver/library/ipaserver_prepare.py
@@ -393,8 +393,8 @@ def main():
                 ansible_log.info("Disabled p11-kit-proxy")
 
     except (RuntimeError, ValueError, ScriptError,
-            ipautil.CalledProcessError) as e:
-        ansible_module.fail_json(msg=str(e))
+            ipautil.CalledProcessError) as err:
+        ansible_module.fail_json(msg=str(err))
 
     ansible_module.exit_json(
         changed=True,
diff --git a/roles/ipaserver/module_utils/ansible_ipa_server.py b/roles/ipaserver/module_utils/ansible_ipa_server.py
index ca20e65f29d9c20c342750fcb21a89f4cf1a13f9..36ee5d6b9ea35b0680750777ccecece2d14f11d9 100644
--- a/roles/ipaserver/module_utils/ansible_ipa_server.py
+++ b/roles/ipaserver/module_utils/ansible_ipa_server.py
@@ -330,9 +330,9 @@ else:
                      _no_hbac_allow, dirsrv_pkcs12_info, no_pkinit):
 
         if not options.external_cert_files:
-            ds = dsinstance.DsInstance(fstore=fstore, domainlevel=domainlevel,
-                                       config_ldif=dirsrv_config_file)
-            ds.set_output(ansible_log)
+            _ds = dsinstance.DsInstance(fstore=fstore, domainlevel=domainlevel,
+                                        config_ldif=dirsrv_config_file)
+            _ds.set_output(ansible_log)
 
             if options.dirsrv_cert_files:
                 _dirsrv_pkcs12_info = dirsrv_pkcs12_info
@@ -340,30 +340,30 @@ else:
                 _dirsrv_pkcs12_info = None
 
             with redirect_stdout(ansible_log):
-                ds.init_info(realm_name, host_name, domain_name, dm_password,
-                             subject_base, ca_subject, idstart, idmax,
-                             # hbac_allow=not no_hbac_allow,
-                             _dirsrv_pkcs12_info, setup_pkinit=not no_pkinit)
+                _ds.init_info(realm_name, host_name, domain_name, dm_password,
+                              subject_base, ca_subject, idstart, idmax,
+                              # hbac_allow=not no_hbac_allow,
+                              _dirsrv_pkcs12_info, setup_pkinit=not no_pkinit)
         else:
-            ds = dsinstance.DsInstance(fstore=fstore, domainlevel=domainlevel)
-            ds.set_output(ansible_log)
+            _ds = dsinstance.DsInstance(fstore=fstore, domainlevel=domainlevel)
+            _ds.set_output(ansible_log)
 
             with redirect_stdout(ansible_log):
-                ds.init_info(realm_name, host_name, domain_name, dm_password,
-                             subject_base, ca_subject, 1101, 1100, None,
-                             setup_pkinit=not no_pkinit)
+                _ds.init_info(realm_name, host_name, domain_name, dm_password,
+                              subject_base, ca_subject, 1101, 1100, None,
+                              setup_pkinit=not no_pkinit)
 
-        return ds
+        return _ds
 
     def ansible_module_get_parsed_ip_addresses(ansible_module,
                                                param='ip_addresses'):
         ip_addrs = []
-        for ip in ansible_module.params.get(param):
+        for _ip in ansible_module.params.get(param):
             try:
-                ip_parsed = ipautil.CheckedIPAddress(ip)
-            except Exception as e:
+                ip_parsed = ipautil.CheckedIPAddress(_ip)
+            except Exception as err:
                 ansible_module.fail_json(
-                    msg="Invalid IP Address %s: %s" % (ip, e))
+                    msg="Invalid IP Address %s: %s" % (_ip, err))
             ip_addrs.append(ip_parsed)
         return ip_addrs