From 58b99bf5eecb6ac427744c89186f3d0afbabc917 Mon Sep 17 00:00:00 2001
From: Jose Luis Franco Arza <jfrancoa@redhat.com>
Date: Thu, 31 Jan 2019 15:23:18 +0100
Subject: [PATCH] Do not pull image while tagging pcmk images in upgrade_tasks.
During the upgrad of pacemaker managed services there is
a temporary tagging of the existing container image to the
newly image we are going to upgrade to. The input during this
taggins is the container image id, in contrast to what is
passed during deploy tasks, which is the image name with its
tag. For that reason, we can't pull the image in these cases
otherwise the role will fail as it can't find an image to pull
from a container image id.
Change-Id: I4fdd3a05465fa0318b4ec5c079d59f4dd80fa9f2
Closes-Bug: #1814104
---
deployment/cinder/cinder-backup-pacemaker-puppet.yaml | 1 +
deployment/cinder/cinder-volume-pacemaker-puppet.yaml | 1 +
deployment/haproxy/haproxy-pacemaker-puppet.yaml | 1 +
deployment/manila/manila-share-pacemaker-puppet.yaml | 1 +
.../rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml | 1 +
deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml | 1 +
deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml | 1 +
docker/services/pacemaker/database/mysql.yaml | 1 +
docker/services/pacemaker/database/redis.yaml | 1 +
docker/services/pacemaker/ovn-dbs.yaml | 1 +
10 files changed, 10 insertions(+)
diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
index 00c82f4d6a..6245ccffc7 100644
--- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
+++ b/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
diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
index 3ba962ed5d..405279686a 100644
--- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
+++ b/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:
diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
index ce9def9aa3..d56c64ddfe 100644
--- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml
+++ b/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:
diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml
index 3e8e5708d6..f7e1faaf66 100644
--- a/deployment/manila/manila-share-pacemaker-puppet.yaml
+++ b/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:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
index 0664796339..134476edb4 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
+++ b/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:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
index 4c109f87b8..6d41f4517a 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
+++ b/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:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
index 4e1f42d0af..eb3708369e 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
+++ b/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:
diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml
index 1ae4b88509..1c7eae532a 100644
--- a/docker/services/pacemaker/database/mysql.yaml
+++ b/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:
diff --git a/docker/services/pacemaker/database/redis.yaml b/docker/services/pacemaker/database/redis.yaml
index 4acc4045f2..8aa85e283f 100644
--- a/docker/services/pacemaker/database/redis.yaml
+++ b/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:
diff --git a/docker/services/pacemaker/ovn-dbs.yaml b/docker/services/pacemaker/ovn-dbs.yaml
index 254e1b9a39..accec78efa 100644
--- a/docker/services/pacemaker/ovn-dbs.yaml
+++ b/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.