openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
fmount 2019-08-29 12:05:19 +02:00
parent bae35832aa
commit 7710183e4d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/ceph-ansible/ceph-base.yaml
View File

@ -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:
- ','