diff --git a/roles/ipaserver/defaults/main.yml b/roles/ipaserver/defaults/main.yml
index ae106aa8dfdbb79e989fd2868fdc17182efea8d3..4af7910919c75c1af9a5bac2e16503d06496f54a 100644
--- a/roles/ipaserver/defaults/main.yml
+++ b/roles/ipaserver/defaults/main.yml
@@ -32,7 +32,6 @@ ipaserver_enable_compat: no
 ipaserver_setup_ca: yes
 
 ### additional ###
-ipaserver_allow_repair: no
 ipaserver_allow_missing: [ ]
 
 ### uninstall ###
diff --git a/roles/ipaserver/library/ipaserver_test.py b/roles/ipaserver/library/ipaserver_test.py
index 83e61511598b124d540b78bbe38cdd11207107fb..e7f2a68ef456e7dcfcfab640c203f3c82cc597c3 100644
--- a/roles/ipaserver/library/ipaserver_test.py
+++ b/roles/ipaserver/library/ipaserver_test.py
@@ -118,7 +118,6 @@ def main():
             secondary_rid_base=dict(required=False, type='int'),
 
             ### additional ###
-            allow_repair=dict(required=False, type='bool', default=False),
         ),
         supports_check_mode = True,
     )
@@ -193,7 +192,6 @@ def main():
     options.secondary_rid_base = ansible_module.params.get('secondary_rid_base')
 
     ### additional ###
-    allow_repair = ansible_module.params.get('allow_repair')
 
     # version specific ######################################################
 
@@ -425,14 +423,14 @@ def main():
 
     options._installation_cleanup = True
     if not options.external_ca and len(options.external_cert_files) < 1 and \
-       is_ipa_configured() and not allow_repair:
+       is_ipa_configured():
         options._installation_cleanup = False
         ansible_module.fail_json(msg=
             "IPA server is already configured on this system. If you want "
             "to reinstall the IPA server, please uninstall it first.")
 
     client_fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE)
-    if client_fstore.has_files() and not allow_repair:
+    if client_fstore.has_files():
         options._installation_cleanup = False
         ansible_module.fail_json(
             msg="IPA client is already configured on this system. "
@@ -497,8 +495,8 @@ def main():
     tasks.check_selinux_status()
 
     _installation_cleanup = True
-    if (not options.external_ca and not options.external_cert_files and
-            is_ipa_configured() and not allow_repair):
+    if not options.external_ca and not options.external_cert_files and \
+       is_ipa_configured():
         _installation_cleanup = False
         ansible_module.fail_json(msg="IPA server is already configured on this system.")
 
@@ -521,8 +519,7 @@ def main():
         try:
             check_dirsrv(True)
         except ScriptError as e:
-            if not allow_repair:
-                ansible_module.fail_json(msg=e)
+            ansible_module.fail_json(msg=e)
 
     if not options.no_ntp:
         try:
@@ -535,7 +532,7 @@ def main():
             pass
 
     # Check to see if httpd is already configured to listen on 443
-    if httpinstance.httpd_443_configured() and not allow_repair:
+    if httpinstance.httpd_443_configured():
         ansible_module.fail_json(msg="httpd is already configured to listen on 443.")
 
     # check bind packages are installed
diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml
index 69349e5aef44de1ec773eea0656d27f1af4dac36..ab98839d38c715e4e04a5c65abc92888aec3530e 100644
--- a/roles/ipaserver/tasks/install.yml
+++ b/roles/ipaserver/tasks/install.yml
@@ -89,7 +89,6 @@
     secondary_rid_base: "{{ ipaserver_secondary_rid_base | default(omit) }}"
 
     ### additional ###
-    allow_repair: "{{ ipaserver_allow_repair }}"
   register: ipaserver_test
 
 
@@ -400,7 +399,6 @@
   #    #no_ssh: "{{ ipaserver_no_ssh }}"
   #    #no_sshd: "{{ ipaserver_no_sshd }}"
   #    mkhomedir: "{{ ipaserver_mkhomedir }}"
-  #    #allow_repair: "{{ ipaserver_allow_repair }}"
 
   - name: Install - Setup client
     command: >