Browse Source

Merge "Parallelize server pre and post steps" into stable/queens

tags/8.4.1
Zuul 2 weeks ago
parent
commit
9f7d0c2a2b
1 changed files with 4 additions and 10 deletions
  1. 4
    10
      common/deploy-steps.j2

+ 4
- 10
common/deploy-steps.j2 View File

@@ -430,13 +430,10 @@ outputs:
430 430
               gather_facts: no
431 431
               any_errors_fatal: yes
432 432
               tasks:
433
-{%- for role in roles %}
434
-                - include: {{role.name}}/deployments.yaml
433
+                - include_tasks: deployments.yaml
435 434
                   vars:
436 435
                     force: false
437
-                  when: tripleo_role_name == '{{role.name}}'
438
-                  with_items: "{{ '{{' }} {{role.name}}_pre_deployments|default([]) {{ '}}' }}"
439
-{%- endfor %}
436
+                  with_items: "{{ '{{' }} lookup('vars', tripleo_role_name + '_pre_deployments')|default([]) {{ '}}' }}"
440 437
               tags:
441 438
                 - overcloud
442 439
                 - pre_deploy_steps
@@ -522,13 +519,10 @@ outputs:
522 519
               gather_facts: no
523 520
               any_errors_fatal: yes
524 521
               tasks:
525
-{%- for role in roles %}
526
-                - include: {{role.name}}/deployments.yaml
522
+                - include_tasks: deployments.yaml
527 523
                   vars:
528 524
                     force: false
529
-                  when: tripleo_role_name == '{{role.name}}'
530
-                  with_items: "{{ '{{' }} {{role.name}}_post_deployments|default([]) {{ '}}' }}"
531
-{%- endfor %}
525
+                  with_items: "{{ '{{' }} lookup('vars', tripleo_role_name + '_post_deployments')|default([]) {{ '}}' }}"
532 526
               tags:
533 527
                 - overcloud
534 528
                 - post_deploy_steps

Loading…
Cancel
Save