diff --git a/ci/environments/disable-unbound.yaml b/ci/environments/disable-unbound.yaml
index 1415e4af9d..89fdbd5572 100644
--- a/ci/environments/disable-unbound.yaml
+++ b/ci/environments/disable-unbound.yaml
@@ -51,7 +51,7 @@ outputs:
             name: unbound
             state: stopped
             enabled: false
-          ignore_errors: true
+          failed_when: false
         - name: Set resolv.conf
           copy:
             content: "nameserver 1.1.1.1\nnameserver 1.0.0.1"
diff --git a/common/deploy-steps-tasks-step-1.yaml b/common/deploy-steps-tasks-step-1.yaml
index ba2e1bd3ab..4a9da41b76 100644
--- a/common/deploy-steps-tasks-step-1.yaml
+++ b/common/deploy-steps-tasks-step-1.yaml
@@ -42,7 +42,6 @@
     - container_startup_configs
   when:
     - ansible_check_mode|bool
-  ignore_errors: true
   check_mode: no
 
 - name: Create /var/lib/tripleo-config/check-mode directory for check mode
@@ -115,7 +114,6 @@
     state: absent
   tags:
     - container_config
-  ignore_errors: true
   check_mode: no
   when:
     - ansible_check_mode|bool
diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml
index 0d83f99197..e4b1ddf2f6 100644
--- a/common/deploy-steps-tasks.yaml
+++ b/common/deploy-steps-tasks.yaml
@@ -53,13 +53,13 @@
       debug:
         var: puppet_host_outputs.stdout_lines | default([]) | union(puppet_host_outputs.stderr_lines | default([]))
       when:
+        - not ansible_check_mode|bool
         - enable_puppet | bool
         - puppet_host_outputs.rc is defined
       changed_when: puppet_host_outputs.rc == 2
       failed_when: puppet_host_outputs.rc not in [0, 2]
       tags:
         - host_config
-      ignore_errors: "{{ ansible_check_mode|bool }}"
 
     #######################################
     # Pre-cache facts for puppet containers
diff --git a/common/generate-config-tasks.yaml b/common/generate-config-tasks.yaml
index 33c1175485..f4caf6c2c8 100644
--- a/common/generate-config-tasks.yaml
+++ b/common/generate-config-tasks.yaml
@@ -35,9 +35,10 @@
     - name: "Debug output for task: Run container-puppet tasks (generate config) during step 1"
       debug:
         var: generate_config_outputs.stdout_lines | default([]) | union(generate_config_outputs.stderr_lines | default([]))
-      when: generate_config_outputs.rc is defined
+      when:
+        - not (ansible_check_mode | bool)
+        - generate_config_outputs.rc is defined
       failed_when: generate_config_outputs.rc != 0
-      ignore_errors: "{{ ansible_check_mode|bool }}"
 
 - name: Block for container-puppet tasks (generate config) during step {{ step }} with tripleo-ansible
   when:
diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml
index a548a1ae71..f4f949b678 100644
--- a/deployment/aodh/aodh-api-container-puppet.yaml
+++ b/deployment/aodh/aodh-api-container-puppet.yaml
@@ -272,14 +272,15 @@ outputs:
           block:
             - name: Check for aodh running under apache
               tags: common
-              shell: "httpd -t -D DUMP_VHOSTS | grep -q aodh_wsgi"
-              ignore_errors: true
+              shell: |-
+                set -o pipefail
+                httpd -t -D DUMP_VHOSTS | grep -q aodh_wsgi
               register: aodh_httpd_enabled_result
             - name: Set fact aodh_httpd_enabled
               set_fact:
                 aodh_httpd_enabled: "{{ aodh_httpd_enabled_result.rc == 0 }}"
             - name: Check if httpd is running
-              ignore_errors: True
+              failed_when: false
               command: systemctl is-active --quiet httpd
               register: httpd_running_result
               when:
diff --git a/deployment/aodh/aodh-evaluator-container-puppet.yaml b/deployment/aodh/aodh-evaluator-container-puppet.yaml
index eadafab8ee..80f07413d1 100644
--- a/deployment/aodh/aodh-evaluator-container-puppet.yaml
+++ b/deployment/aodh/aodh-evaluator-container-puppet.yaml
@@ -137,7 +137,7 @@ outputs:
           block:
             - name: FFU check if openstack-aodh-evaluator is deployed
               command: systemctl is-enabled --quiet openstack-aodh-evaluator
-              ignore_errors: True
+              failed_when: false
               register: aodh_evaluator_enabled_result
             - name: Set fact aodh_evaluator_enabled
               set_fact:
diff --git a/deployment/aodh/aodh-listener-container-puppet.yaml b/deployment/aodh/aodh-listener-container-puppet.yaml
index 013c7d4da1..a418b4c284 100644
--- a/deployment/aodh/aodh-listener-container-puppet.yaml
+++ b/deployment/aodh/aodh-listener-container-puppet.yaml
@@ -137,7 +137,7 @@ outputs:
           block:
             - name: FFU check if openstack-aodh-listener is deployed
               command: systemctl is-enabled --quiet openstack-aodh-listener
-              ignore_errors: True
+              failed_when: false
               register: aodh_listener_enabled_result
             - name: Set fact aodh_listener_enabled
               set_fact:
diff --git a/deployment/aodh/aodh-notifier-container-puppet.yaml b/deployment/aodh/aodh-notifier-container-puppet.yaml
index 16288619aa..7936fa8a13 100644
--- a/deployment/aodh/aodh-notifier-container-puppet.yaml
+++ b/deployment/aodh/aodh-notifier-container-puppet.yaml
@@ -138,7 +138,7 @@ outputs:
           block:
             - name: FFU check if openstack-aodh-notifier is deployed
               command: systemctl is-enabled --quiet openstack-aodh-notifier
-              ignore_errors: True
+              failed_when: false
               register: aodh_notifier_enabled_result
             - name: Set fact aodh_notifier_enabled
               set_fact:
diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
index 9e82da87c8..0b5d540b51 100644
--- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
@@ -195,7 +195,7 @@ outputs:
           block:
             - name: FFU check if openstack-ceilometer-central is deployed
               command: systemctl is-enabled --quiet openstack-ceilometer-central
-              ignore_errors: True
+              failed_when: false
               register: ceilometer_agent_central_enabled_result
             - name: Set fact ceilometer_agent_central_enabled
               set_fact:
diff --git a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
index 2a1c16db83..ec45c7cd47 100644
--- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
@@ -132,7 +132,7 @@ outputs:
           block:
             - name: FFU check if openstack-ceilometer-compute is deployed
               command: systemctl is-enabled openstack-ceilometer-compute
-              ignore_errors: True
+              failed_when: false
               register: ceilometer_agent_compute_enabled_result
             - name: Set fact ceilometer_agent_compute_enabled
               set_fact:
diff --git a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
index 4b6d59294a..8957eb3acc 100644
--- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
@@ -145,7 +145,7 @@ outputs:
           block:
             - name: FFU check if openstack-ceilometer-ipmi is enabled
               command: systemctl is-enabled openstack-ceilometer-ipmi
-              ignore_errors: True
+              failed_when: false
               register: ceilometer_ipmi_enabled_result
             - name: Set fact ceilometer_ipmi_enabled
               set_fact:
diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
index 53cdb288ae..bc82afc630 100644
--- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
@@ -226,7 +226,7 @@ outputs:
           block:
             - name: FFU check if openstack-ceilometer-notification is deployed
               command: systemctl is-enabled openstack-ceilometer-notification
-              ignore_errors: True
+              failed_when: false
               register: ceilometer_agent_notification_enabled_result
             - name: Set fact ceilometer_agent_notification_enabled
               set_fact:
diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml
index 5205a2f40c..6e0934caa1 100644
--- a/deployment/cinder/cinder-api-container-puppet.yaml
+++ b/deployment/cinder/cinder-api-container-puppet.yaml
@@ -406,7 +406,7 @@ outputs:
           block:
             - name: Check is cinder_api is deployed
               command: systemctl is-enabled --quiet openstack-cinder-api
-              ignore_errors: True
+              failed_when: false
               register: cinder_api_enabled_result
             - name: Set fact cinder_api_enabled
               set_fact:
diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml
index a96b7d9aa3..21eed6a25b 100644
--- a/deployment/cinder/cinder-scheduler-container-puppet.yaml
+++ b/deployment/cinder/cinder-scheduler-container-puppet.yaml
@@ -163,7 +163,7 @@ outputs:
           block:
             - name: Check if cinder_scheduler is deployed
               command: systemctl is-enabled --quiet openstack-cinder-scheduler
-              ignore_errors: True
+              failed_when: false
               register: cinder_scheduler_enabled_result
             - name: Set fact cinder_scheduler_enabled
               set_fact:
diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml
index 6437e853f3..5009a63ed9 100644
--- a/deployment/cinder/cinder-volume-container-puppet.yaml
+++ b/deployment/cinder/cinder-volume-container-puppet.yaml
@@ -340,7 +340,7 @@ outputs:
           block:
             - name: Check if cinder_volume is deployed
               command: systemctl is-enabled --quiet openstack-cinder-volume
-              ignore_errors: True
+              failed_when: false
               register: cinder_volume_enabled_result
             - name: Set fact cinder_volume_enabled
               set_fact:
diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
index 657f66a000..4106761410 100644
--- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
@@ -398,7 +398,7 @@ outputs:
                 resource: openstack-cinder-volume
                 state: show
                 check_mode: false
-              ignore_errors: true
+              failed_when: false
               register: cinder_volume_res_result
             - name: Set fact cinder_volume_res
               set_fact:
diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml
index 664b73365b..2d968af4dd 100644
--- a/deployment/database/mysql-pacemaker-puppet.yaml
+++ b/deployment/database/mysql-pacemaker-puppet.yaml
@@ -444,7 +444,7 @@ outputs:
               block:
                 - name: Check Mysql logging configuration in pacemaker
                   command: cibadmin --query --xpath "//storage-mapping[@id='mysql-log']"
-                  ignore_errors: true
+                  failed_when: false
                   register: mysql_logs_moved
                 - name: Change Mysql logging configuration in pacemaker
                   # rc == 6 means the configuration doesn't exist in the CIB
diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml
index c355e3b4cf..91ec768d68 100644
--- a/deployment/database/redis-pacemaker-puppet.yaml
+++ b/deployment/database/redis-pacemaker-puppet.yaml
@@ -387,7 +387,7 @@ outputs:
               block:
                 - name: Check redis logging configuration in pacemaker
                   command: cibadmin --query --xpath "//storage-mapping[@id='redis-log' and @source-dir='/var/log/containers/redis']"
-                  ignore_errors: true
+                  failed_when: false
                   register: redis_logs_moved
                 - name: Change redis logging configuration in pacemaker
                   # rc == 6 means the configuration doesn't exist in the CIB
@@ -463,7 +463,7 @@ outputs:
                 resource: {get_attr: [RedisBase, role_data, service_name]}
                 state: show
                 check_mode: false
-              ignore_errors: true
+              failed_when: false
               register: redis_res_result
             - name: Set fact redis_res
               set_fact:
diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml
index 20ef9fb563..705628897f 100644
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@@ -713,7 +713,7 @@ outputs:
           block:
             - name: Check if glance_api is deployed
               command: systemctl is-enabled --quiet openstack-glance-api
-              ignore_errors: True
+              failed_when: false
               register: glance_api_enabled_result
             - name: Set fact glance_api_enabled
               set_fact:
diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml
index be32ae33ba..d1387a26f6 100644
--- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml
+++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml
@@ -397,7 +397,7 @@ outputs:
             - name: Check if httpd service is running
               command: systemctl is-active --quiet httpd
               tags: common
-              ignore_errors: True
+              failed_when: false
               register: httpd_running_result
               when:
                 - httpd_running is undefined
@@ -409,15 +409,16 @@ outputs:
             - name: Check if gnocchi_api is deployed
               command: systemctl is-enabled --quiet openstack-gnocchi-api
               tags: common
-              ignore_errors: True
+              failed_when: false
               register: gnocchi_api_enabled_result
             - name: Set fact gnocchi_api_enabled
               set_fact:
                 gnocchi_api_enabled: "{{ gnocchi_api_enabled_result.rc == 0 }}"
             - name: Check for gnocchi_api running under apache
               tags: common
-              shell: "httpd -t -D DUMP_VHOSTS | grep -q gnocchi"
-              ignore_errors: True
+              shell: |-
+                set -o pipefail
+                httpd -t -D DUMP_VHOSTS | grep -q gnocchi
               register: gnocchi_httpd_enabled_result
             - name: Set fact gnocchi_httpd_enabled
               set_fact:
diff --git a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
index 18a4a987a3..1163a3c8cc 100644
--- a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
+++ b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
@@ -192,7 +192,7 @@ outputs:
           block:
             - name: FFU check if openstack-gnocchi-metricd is deployed
               command: systemctl is-enabled --quiet openstack-gnocchi-metricd
-              ignore_errors: True
+              failed_when: false
               register: gnocchi_metricd_enabled_result
             - name: Set fact gnocchi_metricd_enabled
               set_fact:
diff --git a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
index 4ae68a5e73..b304673874 100644
--- a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
+++ b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
@@ -180,7 +180,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - name: FFU check if openstack-gnocchi-statsd is deployed
           command: systemctl is-enabled --quiet openstack-gnocchi-statsd
-          ignore_errors: True
+          failed_when: false
           register: gnocchi_statsd_enabled_result
           when:
             - step|int == 0
diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
index b57823f3d7..a6dc1be5f3 100644
--- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml
+++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
@@ -378,7 +378,7 @@ outputs:
           block:
             - name: Check haproxy public certificate configuration in pacemaker
               command: cibadmin --query --xpath "//storage-mapping[@id='haproxy-cert']"
-              ignore_errors: true
+              failed_when: false
               register: haproxy_cert_mounted
             - name: Disable the haproxy cluster resource
               pacemaker_resource:
@@ -489,11 +489,11 @@ outputs:
               block:
                 - name: Check haproxy stats socket configuration in pacemaker
                   command: cibadmin --query --xpath "//storage-mapping[@id='haproxy-var-lib']"
-                  ignore_errors: true
+                  failed_when: false
                   register: haproxy_stats_exposed
                 - name: Check haproxy public certificate configuration in pacemaker
                   command: cibadmin --query --xpath "//storage-mapping[@id='haproxy-cert']"
-                  ignore_errors: true
+                  failed_when: false
                   register: haproxy_cert_mounted
                 - name: Add a bind mount for stats socket in the haproxy bundle
                   command: pcs resource bundle update haproxy-bundle storage-map add id=haproxy-var-lib source-dir=/var/lib/haproxy target-dir=/var/lib/haproxy options=rw
diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml
index 83d5e4684b..6e045ae383 100644
--- a/deployment/heat/heat-api-cfn-container-puppet.yaml
+++ b/deployment/heat/heat-api-cfn-container-puppet.yaml
@@ -236,7 +236,7 @@ outputs:
           block:
             - name: FFU check if openstack-heat-api-cfn service is enabled
               command: systemctl is-enabled openstack-heat-api-cfn
-              ignore_errors: True
+              failed_when: false
               register: heat_api_cfn_enabled_result
             - name: Set fact heat_api_cfn_enabled
               set_fact:
diff --git a/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml b/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
index 4b4099f041..b3fd79b588 100644
--- a/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
+++ b/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
@@ -44,7 +44,7 @@ outputs:
           block:
             - name: FFU check if heat_api_cloudwatch is deployed
               command: systemctl is-enabled openstack-heat-api-cloudwatch
-              ignore_errors: True
+              failed_when: false
               register: heat_api_cloudwatch_enabled_result
             - name: Set fact heat_api_cloudwatch_enabled
               set_fact:
@@ -57,7 +57,7 @@ outputs:
             - heat_api_cloudwatch_enabled|bool
         - name: Remove heat_api_cloudwatch package
           package: name=openstack-heat-api-cloudwatch state=removed
-          ignore_errors: True
+          failed_when: false
           when:
             - step|int == 2
             - release == 'rocky'
diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml
index cc70e2778f..c1df1d3533 100644
--- a/deployment/heat/heat-api-container-puppet.yaml
+++ b/deployment/heat/heat-api-container-puppet.yaml
@@ -298,7 +298,7 @@ outputs:
           block:
             - name: FFU check openstack-heat-api is enabled
               command: systemctl is-enabled openstack-heat-api
-              ignore_errors: True
+              failed_when: false
               register: heat_api_enabled_result
             - name: Set fact heat_api_enabled
               set_fact:
diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml
index 3fd2a3fc95..f39e3b2959 100644
--- a/deployment/heat/heat-engine-container-puppet.yaml
+++ b/deployment/heat/heat-engine-container-puppet.yaml
@@ -320,7 +320,7 @@ outputs:
           block:
             - name: FFU check if openstack-heat-engine is enabled
               command: systemctl is-enabled --quiet openstack-heat-engine
-              ignore_errors: True
+              failed_when: false
               register: heat_engine_enabled_result
             - name: Set fact heat_engine_enabled
               set_fact:
diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml
index 5ce41cc987..5927738adb 100644
--- a/deployment/ironic/ironic-api-container-puppet.yaml
+++ b/deployment/ironic/ironic-api-container-puppet.yaml
@@ -298,7 +298,7 @@ outputs:
           block:
             - name: Check if ironic_api is deployed
               command: systemctl is-enabled --quiet openstack-ironic-api
-              ignore_errors: True
+              failed_when: false
               register: ironic_api_enabled_result
             - name: Set fact ironic_api_enabled
               set_fact:
diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml
index 9122783efc..502eec90bb 100644
--- a/deployment/ironic/ironic-conductor-container-puppet.yaml
+++ b/deployment/ironic/ironic-conductor-container-puppet.yaml
@@ -591,7 +591,7 @@ outputs:
           block:
             - name: Check if ironic_conductor is deployed
               command: systemctl is-enabled --quiet openstack-ironic-conductor
-              ignore_errors: True
+              failed_when: false
               register: ironic_conductor_enabled_result
             - name: Set fact ironic_conductor_enabled
               set_fact:
diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml
index f91973b771..ca4d3ba2d4 100644
--- a/deployment/ironic/ironic-pxe-container-puppet.yaml
+++ b/deployment/ironic/ironic-pxe-container-puppet.yaml
@@ -106,7 +106,7 @@ outputs:
               when: xinetd_active_result.rc == 0
             - name: Check if ironic_pxe_tftp is enabled
               command: systemctl is-enabled --quiet ironic_pxe_tftp
-              ignore_errors: True
+              failed_when: false
               register: ironic_pxe_tftp_enabled_result
             - name: Set fact ironic_pxe_tftp_enabled
               set_fact:
diff --git a/deployment/iscsid/iscsid-container-puppet.yaml b/deployment/iscsid/iscsid-container-puppet.yaml
index de4d584bcc..1bc9c41087 100644
--- a/deployment/iscsid/iscsid-container-puppet.yaml
+++ b/deployment/iscsid/iscsid-container-puppet.yaml
@@ -113,7 +113,7 @@ outputs:
           when: stat_iscsid_socket.stat.exists
         - name: Check if iscsi.service is enabled
           command: systemctl is-enabled --quiet iscsi.service
-          ignore_errors: True
+          failed_when: false
           register: iscsi_service_enabled_result
         - name: Stop iscsi.service
           service: name=iscsi.service state=stopped enabled=no
diff --git a/deployment/keepalived/keepalived-container-puppet.yaml b/deployment/keepalived/keepalived-container-puppet.yaml
index b79a2206f2..49020c30fe 100644
--- a/deployment/keepalived/keepalived-container-puppet.yaml
+++ b/deployment/keepalived/keepalived-container-puppet.yaml
@@ -136,7 +136,7 @@ outputs:
         - name: Restart Keepalived container
           shell: "{{container_cli}} restart keepalived"
           when: restart_keepalived|bool
-          ignore_errors: True
+          failed_when: false
         - name: load ip_vs module
           import_role:
             name: tripleo_module_load
diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
index cb0e4c767e..96dd1a75b1 100644
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@@ -803,13 +803,13 @@ outputs:
             - name: Check for keystone running under apache
               tags: common
               shell: "httpd -t -D DUMP_VHOSTS | grep -q keystone_wsgi"
-              ignore_errors: true
+              failed_when: false
               register: keystone_httpd_enabled_result
             - name: Set fact keystone_httpd_enabled
               set_fact:
                 keystone_httpd_enabled: "{{ keystone_httpd_enabled_result.rc == 0 }}"
             - name: Check if httpd is running
-              ignore_errors: True
+              failed_when: false
               command: systemctl is-active --quiet httpd
               register: httpd_running_result
               when:
diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml
index cfe85445dd..5a3277bfa1 100644
--- a/deployment/manila/manila-api-container-puppet.yaml
+++ b/deployment/manila/manila-api-container-puppet.yaml
@@ -257,7 +257,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - name: Check if manila_api is deployed
           command: systemctl is-enabled --quiet openstack-manila-api
-          ignore_errors: True
+          failed_when: false
           register: manila_api_enabled_result
           when:
             - step|int == 0
diff --git a/deployment/manila/manila-scheduler-container-puppet.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml
index 1332084ef3..ef304cee10 100644
--- a/deployment/manila/manila-scheduler-container-puppet.yaml
+++ b/deployment/manila/manila-scheduler-container-puppet.yaml
@@ -119,7 +119,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - name: Check if manila_scheduler is deployed
           command: systemctl is-enabled --quiet openstack-manila-scheduler
-          ignore_errors: True
+          failed_when: false
           register: manila_scheduler_enabled_result
           when:
             - step|int == 0
diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml
index adfbcd4282..99494b9e2f 100644
--- a/deployment/manila/manila-share-container-puppet.yaml
+++ b/deployment/manila/manila-share-container-puppet.yaml
@@ -174,7 +174,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - name: Check if manila_share is deployed
           command: systemctl is-enabled --quiet openstack-manila-share
-          ignore_errors: True
+          failed_when: false
           register: manila_share_enabled_result
           when:
             - step|int == 0
diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml
index fccd46fb31..67861200e2 100644
--- a/deployment/manila/manila-share-pacemaker-puppet.yaml
+++ b/deployment/manila/manila-share-pacemaker-puppet.yaml
@@ -379,7 +379,7 @@ outputs:
             resource: openstack-manila-share
             state: show
             check_mode: false
-          ignore_errors: true
+          failed_when: false
           register: manila_share_res_result
           when:
             - step|int == 0
diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml
index df39a2641d..9aca9f1cd4 100644
--- a/deployment/memcached/memcached-container-puppet.yaml
+++ b/deployment/memcached/memcached-container-puppet.yaml
@@ -194,7 +194,7 @@ outputs:
             - name: Check if memcached is deployed
               command: systemctl is-enabled --quiet memcached
               tags: common
-              ignore_errors: True
+              failed_when: false
               register: memcached_enabled_result
             - name: memcached_enabled
               set_fact:
diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml
index a36595df17..ba6ce1661f 100644
--- a/deployment/metrics/collectd-container-puppet.yaml
+++ b/deployment/metrics/collectd-container-puppet.yaml
@@ -704,7 +704,7 @@ outputs:
           block:
             - name: Check if collectd.service is deployed
               command: systemctl is-enabled --quiet collectd.service
-              ignore_errors: True
+              failed_when: false
               register: collectd_enabled_result
             - name: Set fact collectd_enabled
               set_fact:
diff --git a/deployment/multipathd/multipathd-container.yaml b/deployment/multipathd/multipathd-container.yaml
index dafe597956..5389ad4b3b 100644
--- a/deployment/multipathd/multipathd-container.yaml
+++ b/deployment/multipathd/multipathd-container.yaml
@@ -136,7 +136,7 @@ outputs:
       host_prep_tasks:
         - name: Check if multipathd is deployed on the host
           command: systemctl is-enabled --quiet multipathd
-          ignore_errors: True
+          failed_when: false
           register: multipathd_enabled_result
         - name: Set fact multipathd_enabled
           set_fact:
diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml
index 362e6ebfdf..2bb99cbe1c 100644
--- a/deployment/neutron/neutron-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-api-container-puppet.yaml
@@ -558,7 +558,7 @@ outputs:
           block:
             - name: Check if neutron_server is deployed
               command: systemctl is-enabled --quiet neutron-server
-              ignore_errors: True
+              failed_when: false
               register: neutron_server_enabled_result
             - name: Set fact neutron_server_enabled
               set_fact:
@@ -581,7 +581,7 @@ outputs:
               package: name=python-networking-odl state=latest
               # package python-networking-cisco may or may not be present
             - name: Networking cisco db sync workaround
-              ignore_errors: true
+              failed_when: false
               package: name=python-networking-cisco state=latest
         - name: Neutron db sync
           command: neutron-db-manage upgrade head
diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml
index 88a98c0769..b64faf1325 100644
--- a/deployment/neutron/neutron-dhcp-container-puppet.yaml
+++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml
@@ -405,10 +405,10 @@ outputs:
           - - name: create /run/netns with temp namespace
               command: ip netns add ns_temp
               register: ipnetns_add_result
-              ignore_errors: True
+              failed_when: false
           - - name: remove temp namespace
               command: ip netns delete ns_temp
-              ignore_errors: True
+              failed_when: false
               when: ipnetns_add_result.rc == 0
           - - name: create /var/lib/neutron
               file:
@@ -428,7 +428,7 @@ outputs:
           block:
             - name: Check if neutron_dhcp_agent is deployed
               command: systemctl is-enabled --quiet neutron-dhcp-agent
-              ignore_errors: True
+              failed_when: false
               register: neutron_dhcp_agent_enabled_result
             - name: Set fact neutron_dhcp_agent_enabled
               set_fact:
@@ -444,7 +444,7 @@ outputs:
           getent:
             database: passwd
             key: neutron
-          ignore_errors: True
+            fail_key: false
         - name: Set neutron_user_avail
           set_fact:
             neutron_user_avail: "{{ getent_passwd is defined }}"
@@ -460,7 +460,7 @@ outputs:
                 setfacl -R -m u:neutron:rw /var/lib/neutron
                 find /var/lib/neutron -type d -exec setfacl -m u:neutron:rwx '{}' \;
             - name: Provide access for domain sockets
-              ignore_errors: True
+              failed_when: false
               become: true
               shell: |
                 umask 0002
@@ -469,4 +469,4 @@ outputs:
                 - /var/lib/neutron/metadata_proxy
                 - /var/lib/neutron
               # These files are not necessarily present
-              ignore_errors: True
+              failed_when: false
diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml
index 291fab91ba..c6ce823803 100644
--- a/deployment/neutron/neutron-l3-container-puppet.yaml
+++ b/deployment/neutron/neutron-l3-container-puppet.yaml
@@ -361,10 +361,10 @@ outputs:
           - - name: create /run/netns with temp namespace
               command: ip netns add ns_temp
               register: ipnetns_add_result
-              ignore_errors: True
+              failed_when: false
           - - name: remove temp namespace
               command: ip netns delete ns_temp
-              ignore_errors: True
+              failed_when: false
               when: ipnetns_add_result.rc == 0
           - - name: create /var/lib/neutron
               file:
@@ -384,7 +384,7 @@ outputs:
           block:
             - name: Check if neutron_l3_agent is deployed
               command: systemctl is-enabled --quiet neutron-l3-agent
-              ignore_errors: True
+              failed_when: false
               register: neutron_l3_agent_enabled_result
             - name: Set fact neutron_l3_agent_enabled
               set_fact:
@@ -400,7 +400,7 @@ outputs:
           getent:
             database: passwd
             key: neutron
-          ignore_errors: True
+            fail_key: false
         - name: Set neutron_user_avail
           set_fact:
             neutron_user_avail: "{{ getent_passwd is defined }}"
@@ -425,4 +425,4 @@ outputs:
                 - /var/lib/neutron/keepalived-state-change
                 - /var/lib/neutron
               # These files are not necessarily present
-              ignore_errors: True
+              failed_when: false
diff --git a/deployment/neutron/neutron-metadata-container-puppet.yaml b/deployment/neutron/neutron-metadata-container-puppet.yaml
index 6733fc6d60..4210312e1a 100644
--- a/deployment/neutron/neutron-metadata-container-puppet.yaml
+++ b/deployment/neutron/neutron-metadata-container-puppet.yaml
@@ -217,7 +217,7 @@ outputs:
           block:
             - name: Check if neutron_metadata_agent is deployed
               command: systemctl is-enabled --quiet neutron-metadata-agent
-              ignore_errors: True
+              failed_when: false
               register: neutron_metadata_agent_enabled_result
             - name: Set fact neutron_metadata_agent_enabled
               set_fact:
@@ -233,7 +233,7 @@ outputs:
           getent:
             database: passwd
             key: neutron
-          ignore_errors: True
+            fail_key: false
         - name: Set neutron_user_avail
           set_fact:
             neutron_user_avail: "{{ getent_passwd is defined }}"
@@ -258,4 +258,4 @@ outputs:
                 - /var/lib/neutron/keepalived-state-change
                 - /var/lib/neutron
               # These files are not necessarily present
-              ignore_errors: True
+              failed_when: false
diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
index 10d2b27ba0..d85eec1bb5 100644
--- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
@@ -396,7 +396,7 @@ outputs:
           block:
             - name: Check if neutron_ovs_agent is deployed
               command: systemctl is-enabled --quiet neutron-openvswitch-agent
-              ignore_errors: True
+              failed_when: false
               register: neutron_ovs_agent_enabled_result
             - name: Set fact neutron_ovs_agent_enabled
               set_fact:
diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml
index f51353ecf0..5f5bbe6a53 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@@ -484,7 +484,7 @@ outputs:
               delay: 30
               until: nova_api_healthcheck_state.status.ExecMainPID != '0' and
                 nova_api_healthcheck_state.status.ActiveState in ['inactive', 'failed']
-              ignore_errors: yes
+              failed_when: false
             - name: Fail if nova-api healthcheck report failed status
               fail:
                 msg: nova-api isn't working (healthcheck failed)
@@ -522,7 +522,7 @@ outputs:
           block:
             - name: Check if nova-api is deployed
               command: systemctl is-enabled --quiet openstack-nova-api
-              ignore_errors: True
+              failed_when: false
               register: nova_api_enabled_result
             - name: Set fact nova_api_enabled
               set_fact:
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index b67eec8873..d7d689e702 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -1067,7 +1067,7 @@ outputs:
               delay: 30
               until: nova_compute_healthcheck_state.status.ExecMainPID != '0' and
                 nova_compute_healthcheck_state.status.ActiveState in ['inactive', 'failed']
-              ignore_errors: yes
+              failed_when: false
             - name: Fail if nova-compute healthcheck report failed status
               fail:
                 msg: nova-compute isn't working (healthcheck failed)
@@ -1080,7 +1080,7 @@ outputs:
               - openstack-nova-compute
               - python-nova
             state: removed
-          ignore_errors: True
+          failed_when: false
           when: step|int == 2
       update_tasks:
         - name: Remove openstack-nova-compute and python-nova package during upgrade
@@ -1089,7 +1089,7 @@ outputs:
               - openstack-nova-compute
               - python-nova
             state: removed
-          ignore_errors: True
+          failed_when: false
           when: step|int == 2
       scale_tasks:
         - when: step|int == 1
@@ -1164,7 +1164,7 @@ outputs:
           block:
             - name: Check if nova-compute is deployed
               command:  systemctl is-enabled --quiet openstack-nova-compute
-              ignore_errors: True
+              failed_when: false
               register: nova_compute_enabled_result
             - name: Set fact nova_compute_enabled
               set_fact:
diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml
index 8cc1bfb94c..7b7fdee6a9 100644
--- a/deployment/nova/nova-conductor-container-puppet.yaml
+++ b/deployment/nova/nova-conductor-container-puppet.yaml
@@ -195,7 +195,7 @@ outputs:
               delay: 30
               until: nova_conductor_healthcheck_state.status.ExecMainPID != '0' and
                 nova_conductor_healthcheck_state.status.ActiveState in ['inactive', 'failed']
-              ignore_errors: yes
+              failed_when: false
             - name: Fail if nova-conductor healthcheck report failed status
               fail:
                 msg: nova-conductor isn't working (healthcheck failed)
@@ -230,7 +230,7 @@ outputs:
           block:
             - name: Check if nova_conductor is deployed
               command: systemctl is-enabled --quiet openstack-nova-conductor
-              ignore_errors: True
+              failed_when: false
               register: nova_conductor_enabled_result
             - name: Set fact nova_conductor_enabled
               set_fact:
diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml
index a16b8ff188..c7493c2674 100644
--- a/deployment/nova/nova-libvirt-container-puppet.yaml
+++ b/deployment/nova/nova-libvirt-container-puppet.yaml
@@ -822,7 +822,7 @@ outputs:
               delay: 30
               until: nova_libvirt_healthcheck_state.status.ExecMainPID != '0' and
                 nova_libvirt_healthcheck_state.status.ActiveState in ['inactive', 'failed']
-              ignore_errors: yes
+              failed_when: false
             - name: Fail if nova-libvirt healthcheck report failed status
               fail:
                 msg: nova-libvirt isn't working (healtcheck failed)
diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml
index 124ab532bf..69ea4424a3 100644
--- a/deployment/nova/nova-metadata-container-puppet.yaml
+++ b/deployment/nova/nova-metadata-container-puppet.yaml
@@ -254,7 +254,7 @@ outputs:
               delay: 30
               until: nova_metadata_healthcheck_state.status.ExecMainPID != '0' and
                 nova_metadata_healthcheck_state.status.ActiveState in ['inactive', 'failed']
-              ignore_errors: yes
+              failed_when: false
             - name: Fail if nova-metadata healthcheck report failed status
               fail:
                 msg: nova-metadata isn't working (healthcheck failed)
diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml
index 27631dc9ac..5e3ff91008 100644
--- a/deployment/nova/nova-migration-target-container-puppet.yaml
+++ b/deployment/nova/nova-migration-target-container-puppet.yaml
@@ -189,7 +189,7 @@ outputs:
               delay: 30
               until: nova_migration_target_healthcheck_state.status.ExecMainPID != '0' and
                 nova_migration_target_healthcheck_state.status.ActiveState in ['inactive', 'failed']
-              ignore_errors: yes
+              failed_when: false
             - name: Fail if nova-migration-target healthcheck report failed status
               fail:
                 msg: nova-migration-target isn't working (healtcheck failed)
diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml
index 1af334e712..228e9909df 100644
--- a/deployment/nova/nova-scheduler-container-puppet.yaml
+++ b/deployment/nova/nova-scheduler-container-puppet.yaml
@@ -204,7 +204,7 @@ outputs:
               delay: 30
               until: nova_scheduler_healthcheck_state.status.ExecMainPID != '0' and
                 nova_scheduler_healthcheck_state.status.ActiveState in ['inactive', 'failed']
-              ignore_errors: yes
+              failed_when: false
             - name: Fail if nova-scheduler healthcheck report failed status
               fail:
                 msg: nova-scheduler isn't working (healthcheck failed)
@@ -224,7 +224,7 @@ outputs:
           block:
             - name: Check if nova_scheduler is deployed
               command: systemctl is-enabled --quiet openstack-nova-scheduler
-              ignore_errors: True
+              failed_when: false
               register: nova_scheduler_enabled_result
             - name: Set fact nova_scheduler_enabled
               set_fact:
diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml
index 0889d3cb93..5fb838cbb0 100644
--- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml
+++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml
@@ -300,7 +300,7 @@ outputs:
               delay: 30
               until: nova_vnc_proxy_healthcheck_state.status.ExecMainPID != '0' and
                 nova_vnc_proxy_healthcheck_state.status.ActiveState in ['inactive', 'failed']
-              ignore_errors: yes
+              failed_when: false
             - name: Fail if nova-vnc-proxy healtcheck report failed status
               fail:
                 msg: nova-vnc-proxy isn't working (healthcheck failed)
@@ -328,7 +328,7 @@ outputs:
           block:
             - name: Check if nova vncproxy is deployed
               command: systemctl is-enabled --quiet openstack-nova-novncproxy
-              ignore_errors: True
+              failed_when: false
               register: nova_vncproxy_enabled_result
             - name: Set fact nova_vncproxy_enabled
               set_fact:
diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml
index 909b19c2e4..5fd6f83884 100644
--- a/deployment/ovn/ovn-metadata-container-puppet.yaml
+++ b/deployment/ovn/ovn-metadata-container-puppet.yaml
@@ -361,10 +361,10 @@ outputs:
           - - name: create /run/netns with temp namespace
               command: ip netns add ns_temp
               register: ipnetns_add_result
-              ignore_errors: True
+              failed_when: false
           - - name: remove temp namespace
               command: ip netns delete ns_temp
-              ignore_errors: True
+              failed_when: false
               when: ipnetns_add_result.rc == 0
           - - name: create /var/lib/neutron
               file:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
index 4082226066..780063bf21 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
@@ -342,7 +342,7 @@ outputs:
               block:
                 - name: Check rabbitmq logging configuration in pacemaker
                   command: cibadmin --query --xpath "//storage-mapping[@id='rabbitmq-log']"
-                  ignore_errors: true
+                  failed_when: false
                   register: rabbitmq_logs_moved
                 - name: Add a bind mount for logging in the rabbitmq bundle
                   # rc == 6 means the configuration doesn't exist in the CIB
@@ -437,7 +437,7 @@ outputs:
                 resource: {get_attr: [RabbitmqBase, role_data, service_name]}
                 state: show
                 check_mode: false
-              ignore_errors: true
+              failed_when: false
               register: rabbitmq_res_result
             - name: Set fact rabbitmq_res
               set_fact:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
index f186e87709..5ee29e6eb2 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
@@ -343,7 +343,7 @@ outputs:
               block:
                 - name: Check rabbitmq logging configuration in pacemaker
                   command: cibadmin --query --xpath "//storage-mapping[@id='rabbitmq-log']"
-                  ignore_errors: true
+                  failed_when: false
                   register: rabbitmq_logs_moved
                 - name: Add a bind mount for logging in the rabbitmq bundle
                   # rc == 6 means the configuration doesn't exist in the CIB
@@ -424,7 +424,7 @@ outputs:
                 resource: {get_attr: [RabbitmqBase, role_data, service_name]}
                 state: show
                 check_mode: false
-              ignore_errors: true
+              failed_when: false
               register: rabbitmq_res_result
             - name: Set fact rabbitmq_res
               set_fact:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
index 821e447d07..4ee670a404 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
@@ -348,7 +348,7 @@ outputs:
               block:
                 - name: Check rabbitmq logging configuration in pacemaker
                   command: cibadmin --query --xpath "//storage-mapping[@id='rabbitmq-log']"
-                  ignore_errors: true
+                  failed_when: false
                   register: rabbitmq_logs_moved
                 - name: Add a bind mount for logging in the rabbitmq bundle
                   # rc == 6 means the configuration doesn't exist in the CIB
@@ -443,7 +443,7 @@ outputs:
                 resource: {get_attr: [RabbitmqBase, role_data, service_name]}
                 state: show
                 check_mode: false
-              ignore_errors: true
+              failed_when: false
               register: rabbitmq_res_result
             - name: Set fact rabbitmq_res
               set_fact:
diff --git a/deployment/sahara/sahara-api-container-puppet.yaml b/deployment/sahara/sahara-api-container-puppet.yaml
index 12581e4d98..a328c70d45 100644
--- a/deployment/sahara/sahara-api-container-puppet.yaml
+++ b/deployment/sahara/sahara-api-container-puppet.yaml
@@ -219,7 +219,7 @@ outputs:
           block:
             - name: FFU check openstack-sahara-api is enabled
               command: systemctl is-enabled openstack-sahara-api
-              ignore_errors: True
+              failed_when: false
               register: sahara_api_enabled_result
             - name: Set fact sahara_api_enabled
               set_fact:
diff --git a/deployment/sahara/sahara-engine-container-puppet.yaml b/deployment/sahara/sahara-engine-container-puppet.yaml
index 181aedeb43..b476934cb6 100644
--- a/deployment/sahara/sahara-engine-container-puppet.yaml
+++ b/deployment/sahara/sahara-engine-container-puppet.yaml
@@ -141,7 +141,7 @@ outputs:
           block:
             - name: FFU check if openstack-sahara-engine is enabled
               command: systemctl is-enabled --quiet openstack-sahara-engine
-              ignore_errors: True
+              failed_when: false
               register: sahara_engine_enabled_result
             - name: Set fact sahara_engine_enabled
               set_fact:
diff --git a/deployment/snmp/snmp-baremetal-puppet.yaml b/deployment/snmp/snmp-baremetal-puppet.yaml
index 1cc2eb390d..041d071524 100644
--- a/deployment/snmp/snmp-baremetal-puppet.yaml
+++ b/deployment/snmp/snmp-baremetal-puppet.yaml
@@ -93,7 +93,7 @@ outputs:
           block:
             - name: Check if snmpd is enabled
               command: systemctl is-enabled --quiet snmpd
-              ignore_errors: True
+              failed_when: false
               register: snmpd_enabled_result
             - name: Set fact snmpd_enabled
               set_fact:
diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml
index dfe064d7b3..b5da71c95f 100644
--- a/deployment/swift/swift-proxy-container-puppet.yaml
+++ b/deployment/swift/swift-proxy-container-puppet.yaml
@@ -479,7 +479,7 @@ outputs:
           block:
             - name: Check if swift-proxy or swift-object-expirer are deployed
               command: systemctl is-enabled --quiet "{{ item }}"
-              ignore_errors: True
+              failed_when: false
               register: swift_proxy_services_enabled_result
               with_items:
                 - openstack-swift-proxy
diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml
index 604b6a72f5..4d55eadda4 100644
--- a/deployment/swift/swift-storage-container-puppet.yaml
+++ b/deployment/swift/swift-storage-container-puppet.yaml
@@ -688,7 +688,7 @@ outputs:
                 - openstack-swift-object-updater
                 - openstack-swift-object
                 - openstack-swift-object-reconstructor
-              ignore_errors: True
+              failed_when: false
               register: swift_services_enabled_result
             - name: Set fact swift_services_enabled
               set_fact:
diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index 69b9ec0a5c..d775eb5c13 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -241,7 +241,7 @@ outputs:
                 set -o pipefail
                 yum info -q rhosp-openvswitch | awk '/^Version/{print $NF}'
               register: rhosp_package_result
-              ignore_errors: true
+              failed_when: false
             - name: Set fact for triggering OpenvSwitch layered product package handling
               set_fact:
                 ovs_lp_packaging: "{{ rhosp_package_result.rc == 0 }}"
@@ -295,13 +295,13 @@ outputs:
           block:
             - name: check if an upgrade is required
               register: ovs_need_upgrade
-              ignore_errors: true
+              failed_when: false
               shell: |
                 yum check-upgrade openvswitch | awk '/openvswitch/{print}'
             - name: Check openvswitch packaging.
               shell: rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep -q "systemctl.*try-restart"
               register: ovs_packaging_issue
-              ignore_errors: true
+              failed_when: false
         - name: Upgrade openvswitch
           block:
             - name: "Ensure empty directory: emptying."
@@ -332,7 +332,7 @@ outputs:
           when:
             - step|int == 2
             - run_ovs_update|bool
-            - ovs_packaging_issue|default(false)|succeeded
+            - ovs_packaging_issue.rc == 0 | default(false)
             - ovs_need_upgrade.stdout|default('')
         - name: Install libibverbs (https://bugs.launchpad.net/tripleo/+bug/1817743)
           when: step|int == 2
@@ -356,7 +356,7 @@ outputs:
         - name: Check that os-net-config has configuration
           shell: test -s /etc/os-net-config/config.json
           register: os_net_config_has_config
-          ignore_errors: True
+          failed_when: false
           when: step|int == 3
         - block:
             - name: Upgrade os-net-config
diff --git a/deployment/undercloud/undercloud-upgrade.yaml b/deployment/undercloud/undercloud-upgrade.yaml
index 9f48a5c773..3813695dfd 100644
--- a/deployment/undercloud/undercloud-upgrade.yaml
+++ b/deployment/undercloud/undercloud-upgrade.yaml
@@ -89,7 +89,7 @@ outputs:
                 set -o pipefail
                 yum info -q rhosp-openvswitch | awk '/^Version/{print $NF}'
               register: rhosp_package_result
-              ignore_errors: true
+              failed_when: false
             - name: Set fact for triggering OpenvSwitch layered product package handling
               set_fact:
                 ovs_lp_packaging: "{{ rhosp_package_result.rc == 0 }}"
@@ -143,13 +143,13 @@ outputs:
           block:
             - name: check if an upgrade is required
               register: ovs_need_upgrade
-              ignore_errors: true
+              failed_when: false
               shell: |
                 yum check-upgrade openvswitch | awk '/openvswitch/{print}'
             - name: Check openvswitch packaging.
               shell: rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep -q "systemctl.*try-restart"
               register: ovs_packaging_issue
-              ignore_errors: true
+              failed_when: false
         - name: Upgrade openvswitch
           block:
             - name: "Ensure empty directory: emptying."
@@ -180,7 +180,7 @@ outputs:
           when:
             - step|int == 2
             - run_ovs_update|bool
-            - ovs_packaging_issue|default(false)|succeeded
+            - ovs_packaging_issue.rc == 0 | default(false)
             - ovs_need_upgrade.stdout|default('')
         # The openvswitch package disables the systemd service on install. When installing
         # the layered product we prevent the service from being killed, but it doesn't
diff --git a/deployment/vpp/vpp-baremetal-puppet.yaml b/deployment/vpp/vpp-baremetal-puppet.yaml
index cfd2bbe9d7..f6ba00a396 100644
--- a/deployment/vpp/vpp-baremetal-puppet.yaml
+++ b/deployment/vpp/vpp-baremetal-puppet.yaml
@@ -57,7 +57,7 @@ outputs:
         - name: Check if vpp is deployed
           command: systemctl is-enabled vpp
           tags: common
-          ignore_errors: True
+          failed_when: false
           register: vpp_enabled
         - name: "PreUpgrade step0,validation: Check service vpp is running"
           shell: /usr/bin/systemctl show 'vpp' --property ActiveState | grep '\bactive\b'