Browse Source

Merge "Use separate plays for Host prep steps" into stable/rocky

tags/9.4.1^0
Zuul 1 week ago
parent
commit
4a691d6831
1 changed files with 4 additions and 5 deletions
  1. 4
    5
      common/deploy-steps.j2

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

@@ -453,21 +453,20 @@ outputs:
453 453
               tags:
454 454
                 - overcloud
455 455
                 - pre_deploy_steps
456
+{%- for role in roles %}
456 457
 
457
-            - hosts: {{primary_role_name}}:DEPLOY_TARGET_HOST
458
-              name: Host prep steps
458
+            - hosts: {{role.name}}
459
+              name: {{role.name}} Host prep steps
459 460
               gather_facts: no
460 461
               any_errors_fatal: yes
461 462
               vars:
462 463
                 bootstrap_server_id: BOOTSTRAP_SERVER_ID
463 464
               tasks:
464
-{%- for role in roles %}
465 465
                 - import_tasks: {{role.name}}/host_prep_tasks.yaml
466
-                  when: tripleo_role_name == '{{role.name}}'
467
-{%- endfor %}
468 466
               tags:
469 467
                 - overcloud
470 468
                 - host_prep_steps
469
+{%- endfor %}
471 470
 
472 471
 {%- for step in range(1,deploy_steps_max) %}
473 472
 

Loading…
Cancel
Save