From 7710183e4d5a282bd9a0f3700ae4c07bca4bd19d Mon Sep 17 00:00:00 2001
From: fmount <fpantano@redhat.com>
Date: Thu, 29 Aug 2019 12:05:19 +0200
Subject: [PATCH] Restore docker variabes in ceph-base

Since ceph-ansible doesn't support yet the container
generic variables already merged here, this change
restores the docker registry/image_tag/container values
to pull the right container from the registry.
This change can be reverted when the ceph-ansible PR
will be merged.

ceph-ansible PR: https://github.com/ceph/ceph-ansible/pull/4002

Change-Id: I5185371e92e7ea10489c7abfa89a24b12d67220b
---
 deployment/ceph-ansible/ceph-base.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml
index 963747c8eb..c794c85742 100644
--- a/deployment/ceph-ansible/ceph-base.yaml
+++ b/deployment/ceph-ansible/ceph-base.yaml
@@ -307,9 +307,9 @@ resources:
           fsid: { get_param: CephClusterFSID }
           cluster: { get_param: CephClusterName }
           configure_firewall: false
-          ceph_container_registry: {get_attr: [ContainerImageUrlParts, value, host]}
-          ceph_container_image: {get_attr: [ContainerImageUrlParts, value, image]}
-          ceph_container_image_tag: {get_attr: [ContainerImageUrlParts, value, image_tag]}
+          ceph_docker_registry: {get_attr: [ContainerImageUrlParts, value, host]}
+          ceph_docker_image: {get_attr: [ContainerImageUrlParts, value, image]}
+          ceph_docker_image_tag: {get_attr: [ContainerImageUrlParts, value, image_tag]}
           public_network:
             list_join:
               - ','