Merge "Do not pull image while tagging pcmk images in upgrade_tasks."

deployment/cinder/cinder-backup-pacemaker-puppet.yaml

@@ -298,6 +298,7 @@ outputs:
                   vars:
                     container_image: "{{cinder_backup_current_pcmklatest_id.stdout}}"
                     container_image_latest: "{{cinder_backup_docker_image_latest}}"
+                    pull_image: false
             - name: Check openstack-cinder-backup cluster resource status
               pacemaker_resource:
                 resource: openstack-cinder-backup

deployment/cinder/cinder-volume-pacemaker-puppet.yaml

@@ -281,6 +281,7 @@ outputs:
                   vars:
                     container_image: "{{cinder_volume_current_pcmklatest_id.stdout}}"
                     container_image_latest: "{{cinder_volume_docker_image_latest}}"
+                    pull_image: false
                   when: cinder_volume_current_pcmklatest_id.stdout != ''
             - name: Check openstack-cinder-volume cluster resource status
               pacemaker_resource:

deployment/haproxy/haproxy-pacemaker-puppet.yaml

@@ -459,6 +459,7 @@ outputs:
                   vars:
                     container_image: "{{haproxy_current_pcmklatest_id.stdout}}"
                     container_image_latest: "{{haproxy_docker_image_latest}}"
+                    pull_image: false
                   when: haproxy_current_pcmklatest_id.stdout != ''
             - name: Check haproxy-bundle cluster resource status
               pacemaker_resource:

deployment/manila/manila-share-pacemaker-puppet.yaml

@@ -282,6 +282,7 @@ outputs:
                   vars:
                     container_image: "{{manila_share_current_pcmklatest_id.stdout}}"
                     container_image_latest: "{{manila_share_docker_image_latest}}"
+                    pull_image: false
                   when: manila_share_current_pcmklatest_id.stdout != ''
             - name: Check openstack-manila-share cluster resource status
               pacemaker_resource:

deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml

@@ -298,6 +298,7 @@ outputs:
               vars:
                 container_image: "{{docker_image}}"
                 container_image_latest: "{{docker_image_latest}}"
+                pull_image: false
             # Got to check that pacemaker_is_active is working fine with bundle.
             # TODO: pacemaker_is_active resource doesn't support bundle.
       upgrade_tasks:

deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml

@@ -359,6 +359,7 @@ outputs:
               vars:
                 container_image: "{{rabbitmq_current_pcmklatest_id.stdout}}"
                 container_image_latest: "{{rabbitmq_docker_image_latest}}"
+                pull_image: false
               when: rabbitmq_current_pcmklatest_id.stdout != ''
         - name: Check rabbitmq-bundle cluster resource status
           pacemaker_resource:

deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml

@@ -359,6 +359,7 @@ outputs:
               vars:
                 container_image: "{{rabbitmq_current_pcmklatest_id.stdout}}"
                 container_image_latest: "{{rabbitmq_docker_image_latest}}"
+                pull_image: false
               when: rabbitmq_current_pcmklatest_id.stdout != ''
         - name: Check rabbitmq-bundle cluster resource status
           pacemaker_resource:

docker/services/pacemaker/database/mysql.yaml

@@ -375,6 +375,7 @@ outputs:
                   vars:
                     container_image: "{{galera_current_pcmklatest_id.stdout}}"
                     container_image_latest: "{{mysql_docker_image_latest}}"
+                    pull_image: false
                   when: galera_current_pcmklatest_id.stdout != ''
             - name: Check galera cluster resource status
               pacemaker_resource:

docker/services/pacemaker/database/redis.yaml

@@ -354,6 +354,7 @@ outputs:
                   vars:
                     container_image: "{{redis_current_pcmklatest_id.stdout}}"
                     container_image_latest: "{{redis_docker_image_latest}}"
+                    pull_image: false
                   when: redis_current_pcmklatest_id.stdout != ''
             - name: Check redis-bundle cluster resource status
               pacemaker_resource:

docker/services/pacemaker/ovn-dbs.yaml

@@ -298,6 +298,7 @@ outputs:
               vars:
                 container_image: "{{ovn_dbs_current_pcmklatest_id.stdout}}"
                 container_image_latest: "{{ovn_dbs_docker_image_latest}}"
+                pull_image: false
               when: ovn_dbs_current_pcmklatest_id.stdout != ''
             # If ovn-dbs image is not tagged with pcmklatest, then create a new
             # tag. This could happen if the stack is upgraded without updating the stack before.