Merge "Fix pacemaker tagging race condition"

docker/services/pacemaker/cinder-backup.yaml

@@ -247,7 +247,7 @@ outputs:
             state: directory
       deploy_steps_tasks:
         - name: Cinder Backup tag container image for pacemaker
-          when: step|int == 2
+          when: step|int == 1
           import_role:
             name: tripleo-container-tag
           vars:

docker/services/pacemaker/cinder-volume.yaml

@@ -213,7 +213,7 @@ outputs:
       host_prep_tasks: {get_attr: [CinderCommon, cinder_volume_host_prep_tasks]}
       deploy_steps_tasks:
         - name: Cinder Volume tag container image for pacemaker
-          when: step|int == 2
+          when: step|int == 1
           import_role:
             name: tripleo-container-tag
           vars:

docker/services/pacemaker/database/mysql.yaml

@@ -307,7 +307,7 @@ outputs:
         get_attr: [MysqlPuppetBase, role_data, metadata_settings]
       deploy_steps_tasks:
         - name: MySQL tag container image for pacemaker
-          when: step|int == 2
+          when: step|int == 1
           import_role:
             name: tripleo-container-tag
           vars:

docker/services/pacemaker/database/redis.yaml

@@ -286,7 +286,7 @@ outputs:
           ignore_errors: true
       deploy_steps_tasks:
         - name: Redis tag container image for pacemaker
-          when: step|int == 2
+          when: step|int == 1
           import_role:
             name: tripleo-container-tag
           vars:

docker/services/pacemaker/haproxy.yaml

@@ -290,7 +290,7 @@ outputs:
         get_attr: [HAProxyBase, role_data, metadata_settings]
       deploy_steps_tasks:
         - name: HAproxy tag container image for pacemaker
-          when: step|int == 2
+          when: step|int == 1
           import_role:
             name: tripleo-container-tag
           vars:

docker/services/pacemaker/manila-share.yaml

@@ -214,7 +214,7 @@ outputs:
             state: directory
       deploy_steps_tasks:
         - name: Manila Share tag container image for pacemaker
-          when: step|int == 2
+          when: step|int == 1
           import_role:
             name: tripleo-container-tag
           vars:

docker/services/pacemaker/notify-rabbitmq.yaml

@@ -260,7 +260,7 @@ outputs:
         get_attr: [RabbitmqBase, role_data, metadata_settings]
       deploy_steps_tasks:
         - name: RabbitMQ tag container image for pacemaker
-          when: step|int == 2
+          when: step|int == 1
           import_role:
             name: tripleo-container-tag
           vars:

docker/services/pacemaker/ovn-dbs.yaml

@@ -196,7 +196,7 @@ outputs:
           ignore_errors: true
       deploy_steps_tasks:
         - name: OVN DBS tag container image for pacemaker
-          when: step|int == 2
+          when: step|int == 1
           import_role:
             name: tripleo-container-tag
           vars:

docker/services/pacemaker/rabbitmq.yaml

@@ -259,7 +259,7 @@ outputs:
         get_attr: [RabbitmqBase, role_data, metadata_settings]
       deploy_steps_tasks:
         - name: RabbitMQ tag container image for pacemaker
-          when: step|int == 2
+          when: step|int == 1
           import_role:
             name: tripleo-container-tag
           vars:

docker/services/pacemaker/rpc-rabbitmq.yaml

@@ -260,7 +260,7 @@ outputs:
             for pid in $(pgrep epmd --ns 1 --nslist pid); do kill $pid; done
       deploy_steps_tasks:
         - name: RabbitMQ tag container image for pacemaker
-          when: step|int == 2
+          when: step|int == 1
           import_role:
             name: tripleo-container-tag
           vars: