diff --git a/playbooks/leapp_preupgrade_ansible.yml b/playbooks/leapp_preupgrade_ansible.yml index 405a646..0e305a9 100644 --- a/playbooks/leapp_preupgrade_ansible.yml +++ b/playbooks/leapp_preupgrade_ansible.yml @@ -199,8 +199,8 @@ - name: Set message if inhibitors or errors present set_fact: message: >- - "The upgrade cannot proceed. Your system has {{ error_count | int + inhibitor_count | int }} inhibitor{{ 's' if inhibitor_count | int + error_count | int != 1 else '' }} - out of {{ total_problems_count }} potential problems." + The upgrade cannot proceed. Your system has {{ error_count | int + inhibitor_count | int }} inhibitor{{ 's' if inhibitor_count | int + error_count | int != 1 else '' }} + out of {{ total_problems_count }} potential problems. when: inhibitor_count != "0" or error_count != "0" diff --git a/playbooks/leapp_upgrade_ansible.yml b/playbooks/leapp_upgrade_ansible.yml index a16967c..74d5eb2 100644 --- a/playbooks/leapp_upgrade_ansible.yml +++ b/playbooks/leapp_upgrade_ansible.yml @@ -203,15 +203,15 @@ - name: Set default fail message set_fact: message: >- - "The upgrade cannot proceed. + The upgrade cannot proceed. Your system has {{ error_count | int + inhibitor_count | int }} inhibitor{{ 's' if inhibitor_count | int + error_count | int != 1 else '' }} - out of {{ total_problems_count }} potential problems." + out of {{ total_problems_count }} potential problems. - name: Set message if leapp upgrade succeeded set_fact: message: >- - "No problems found. The system will be upgraded. Rebooting system in 1 minute. - After reboot check inventory to verify the RHEL system is registered with new major version." + No problems found. The system will be upgraded. Rebooting system in 1 minute. + After reboot check inventory to verify the RHEL system is registered with new major version. when: is_leapp_upgrade_successful is true - name: Set report content as empty if upgrade was successful