diff --git a/roles/ipa/server/tasks/main.yml b/roles/ipa/server/tasks/main.yml
index 61274b61e8..b4ec35ac38 100644
--- a/roles/ipa/server/tasks/main.yml
+++ b/roles/ipa/server/tasks/main.yml
@@ -161,6 +161,9 @@
   - ipa/server
   - config
   when: inventory_hostname.startswith("ipa01")
+  register: promote_output
+  changed_when: "'already a member' not in promote_output.stderr"
+  failed_when: "'already a member' not in promote_output.stderr and promote_output.rc != 0"
 
 - name: Configure password policy
   command: ipa pwpolicy-mod global_policy --maxlife=0 --minlife=0 --history=0 --minclasses=0 --minlength=0 --maxfail=0