openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Replace hard-coded 'docker pull' by '{{container_cli}} pull' 

This should prevent some issues when we're using podman...

Change-Id: I4777e4cc4238d74d72cc4c2a09783563ec777d96
This commit is contained in:
Cédric Jeanneret 2019-03-21 11:03:03 +01:00
parent 59fc8f10a3
commit 8895739702
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/cinder/cinder-backup-pacemaker-puppet.yaml
View File

@ -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

2
deployment/cinder/cinder-volume-pacemaker-puppet.yaml
View File

@ -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

2
deployment/database/mysql-pacemaker-puppet.yaml
View File

@ -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

2
deployment/database/redis-pacemaker-puppet.yaml
View File

@ -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

2
deployment/manila/manila-share-pacemaker-puppet.yaml
View File

@ -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

2
deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
View File

@ -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

2
deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
View File

@ -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

2
deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
View File

@ -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

2
docker/services/pacemaker/ovn-dbs.yaml
View File

@ -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