From 8895739702dc2a97333389a2ff2bb12a2d125e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Thu, 21 Mar 2019 11:03:03 +0100 Subject: [PATCH] Replace hard-coded 'docker pull' by '{{container_cli}} pull' This should prevent some issues when we're using podman... Change-Id: I4777e4cc4238d74d72cc4c2a09783563ec777d96 --- deployment/cinder/cinder-backup-pacemaker-puppet.yaml | 2 +- deployment/cinder/cinder-volume-pacemaker-puppet.yaml | 2 +- deployment/database/mysql-pacemaker-puppet.yaml | 2 +- deployment/database/redis-pacemaker-puppet.yaml | 2 +- deployment/manila/manila-share-pacemaker-puppet.yaml | 2 +- .../rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml | 2 +- deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml | 2 +- .../rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml | 2 +- docker/services/pacemaker/ovn-dbs.yaml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 58b34f42c6..16c93469d5 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml @@ -263,7 +263,7 @@ outputs: when: - cinder_backup_image_id.stdout != '' - name: Pull latest Cinder-Backup images - command: "docker pull {{docker_image}}" + command: "{{container_cli}} pull {{docker_image}}" - name: Retag pcmklatest to latest Cinder-Backup image import_role: name: tripleo-container-tag diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index be24835b29..deaa7486a1 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -247,7 +247,7 @@ outputs: when: - cinder_volume_image_id.stdout != '' - name: Pull latest Cinder-Volume images - command: "docker pull {{docker_image}}" + command: "{{container_cli}} pull {{docker_image}}" - name: Retag pcmklatest to latest Cinder-Volume image import_role: name: tripleo-container-tag diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index a593c4fad6..3a5c0726aa 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/deployment/database/mysql-pacemaker-puppet.yaml @@ -366,7 +366,7 @@ outputs: when: - mariadb_image_id.stdout != '' - name: Pull latest Mariadb images - command: "docker pull {{docker_image}}" + command: "{{container_cli}} pull {{docker_image}}" - name: Retag pcmklatest to latest Mariadb image import_role: name: tripleo-container-tag diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index 1d6fc29b4b..8b66a7543e 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/deployment/database/redis-pacemaker-puppet.yaml @@ -333,7 +333,7 @@ outputs: when: - redis_image_id.stdout != '' - name: Pull latest Redis images - command: "docker pull {{docker_image}}" + command: "{{container_cli}} pull {{docker_image}}" - name: Retag pcmklatest to latest Redis image import_role: name: tripleo-container-tag diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index 8a0dfd847e..f89430ab8a 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/deployment/manila/manila-share-pacemaker-puppet.yaml @@ -248,7 +248,7 @@ outputs: when: - manila_share_image_id.stdout != '' - name: Pull latest Manila-Share images - command: "docker pull {{docker_image}}" + command: "{{container_cli}} pull {{docker_image}}" - name: Retag pcmklatest to latest Manila-Share image import_role: name: tripleo-container-tag diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 8166f56e4f..6c1a603f17 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml @@ -293,7 +293,7 @@ outputs: when: - rabbitmq_image_id.stdout != '' - name: Pull latest Rabbitmq images - command: "docker pull {{docker_image}}" + command: "{{container_cli}} pull {{docker_image}}" - name: Retag pcmklatest to latest Rabbitmq image import_role: name: tripleo-container-tag diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index 5ad2dd632c..6983804639 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml @@ -293,7 +293,7 @@ outputs: when: - rabbitmq_image_id.stdout != '' - name: Pull latest Rabbitmq images - command: "docker pull {{docker_image}}" + command: "{{container_cli}} pull {{docker_image}}" - name: Retag pcmklatest to latest Rabbitmq image import_role: name: tripleo-container-tag diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index e2cf5cbca2..a2d2f501c2 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -293,7 +293,7 @@ outputs: when: - rabbitmq_image_id.stdout != '' - name: Pull latest Rabbitmq images - command: "docker pull {{docker_image}}" + command: "{{container_cli}} pull {{docker_image}}" - name: Retag pcmklatest to latest Rabbitmq image import_role: name: tripleo-container-tag diff --git a/docker/services/pacemaker/ovn-dbs.yaml b/docker/services/pacemaker/ovn-dbs.yaml index 8380a3ecf1..06564e76c8 100644 --- a/docker/services/pacemaker/ovn-dbs.yaml +++ b/docker/services/pacemaker/ovn-dbs.yaml @@ -239,7 +239,7 @@ outputs: when: - ovn_dbs_image_id.stdout != '' - name: Pull latest ovn-dbs images - command: "docker pull {{ovn_dbs_docker_image}}" + command: "{{container_cli}} pull {{ovn_dbs_docker_image}}" - name: Retag pcmklatest to latest ovn-dbs image import_role: name: tripleo-container-tag