From ae528b662630d9950ee098a5f775489f7861f7f5 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Tue, 1 May 2018 13:21:23 -0400
Subject: [PATCH] Run tasks on primary role first

This patch adds the primary role name as the first host pattern in the
individual plays in deploy-steps.j2. This will ensure that the primary
role will execute tasks first, which is needed so that all Pacemaker
nodes run the same step at the same time.

Change-Id: I9c499be87ce51ae28914b013b4b91446a3a68015
Closes-Bug: #1768238
(cherry picked from commit 1497da08d5cdce4c72e12b422a70905bf30bda6b)
---
 common/deploy-steps.j2 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index adc2bd8c07..cf58aad19a 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -417,7 +417,7 @@ outputs:
               tags:
                 - common_roles
 
-            - hosts: overcloud
+            - hosts: {{primary_role_name}}:overcloud
               name: Server deployments
               gather_facts: no
               any_errors_fatal: yes
@@ -433,7 +433,7 @@ outputs:
                 - overcloud
                 - pre_deploy_steps
 
-            - hosts: overcloud
+            - hosts: {{primary_role_name}}:overcloud
               name: Host prep steps
               gather_facts: no
               any_errors_fatal: yes
@@ -464,7 +464,7 @@ outputs:
                 - external
                 - external_deploy_steps
 
-            - hosts: overcloud
+            - hosts: {{primary_role_name}}:overcloud
               name: Overcloud deploy step tasks for {{step}}
               gather_facts: no
               any_errors_fatal: yes
@@ -483,7 +483,7 @@ outputs:
                 - overcloud
                 - deploy_steps
 
-            - hosts: overcloud
+            - hosts: {{primary_role_name}}:overcloud
               name: Overcloud common deploy step tasks {{step}}
               gather_facts: no
               any_errors_fatal: yes
@@ -497,7 +497,7 @@ outputs:
                 - deploy_steps
 
 {%- endfor %}
-            - hosts: overcloud
+            - hosts: {{primary_role_name}}:overcloud
               name: Server Post Deployments
               gather_facts: no
               any_errors_fatal: yes