diff --git a/tasks/main.yml b/tasks/main.yml index e9757da0..07479077 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -25,15 +25,36 @@ when: workload_launch_traffic|bool tags: always -- name: launch workload - shell: | - set -o pipefail - {{ workload_launch_script }} {{(workload_launch_traffic|bool)|ternary("workload_traffic","")}} 2>&1 {{ timestamper_cmd }} >> workload_launch.log - args: - chdir: "{{ working_dir }}" - executable: /usr/bin/bash +- name: workload launch when: workload_launch|bool tags: always + block: + - name: create pre workload_launch workarounds + template: + src: workarounds.sh.j2 + dest: "{{ working_dir }}/{{ item }}.sh" + mode: 0775 + force: true + when: ffu_upgrade_workarounds|bool or updates_workarounds|bool + loop: + - 'pre_workload_launch_workarounds' + + - name: apply pre workload_launch workarounds + shell: | + set -o pipefail + ./pre_workload_launch_workarounds.sh 2>&1 {{ timestamper_cmd }} >> pre_workload_launch_workarounds.log + args: + chdir: "{{ working_dir }}" + executable: /usr/bin/bash + when: ffu_upgrade_workarounds|bool or updates_workarounds|bool + + - name: launch workload + shell: | + set -o pipefail + {{ workload_launch_script }} {{(workload_launch_traffic|bool)|ternary("workload_traffic","")}} 2>&1 {{ timestamper_cmd }} >> workload_launch.log + args: + chdir: "{{ working_dir }}" + executable: /usr/bin/bash - include_tasks: upgrade/main.yml when: > diff --git a/templates/workarounds.sh.j2 b/templates/workarounds.sh.j2 index 8f808b8e..10eb3e8b 100644 --- a/templates/workarounds.sh.j2 +++ b/templates/workarounds.sh.j2 @@ -252,3 +252,9 @@ ansible_patch {{ key }} {{ render_workarounds(post_ffu_overcloud_ceph_workarounds|default([]),'post_ffu_overcloud_ceph_workarounds') }} {# finish post_ffu_overcloud_ceph_workarounds #} {% endif -%} + +{% if updates_workarounds|bool or ffu_upgrade_workarounds|bool -%} +# Render for pre_workload_launch_workarounds +{{ render_workarounds(pre_workload_launch_workarounds|default([]),'pre_workload_launch_workarounds') }} +{# finish pre_workload_launch_workarounds #} +{% endif -%}