openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix address for glusterfs container images 

The `openshift_storage_glusterfs*_version` openshift-ansible variables
were removed in commit [1] as a way to specify the image tags to use.
Instead, the image URL needs to be fully specified in the
`openshift_storage_glusterfs*_image` variables to include the tags.

[1] 0be4b2565b

Change-Id: Ia68ff32008c154a644af88ef5d4da21b2b368526
Closes-Bug: #1805611
This commit is contained in:
Martin André 2018-11-28 11:45:49 +01:00
parent f1ce0b106b
commit 7c070ab11e
1 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
extraconfig/services/openshift-cns.yaml
View File

@ -102,42 +102,9 @@ outputs:
- openshift_storage_glusterfs_storageclass_default: true
openshift_hosted_registry_storage_kind: glusterfs
- {get_param: OpenShiftGlusterNodeVars}
- openshift_storage_glusterfs_image:
yaql:
expression:
$.data.image.rightSplit(":", 1)[0]
data:
image: {get_param: DockerOpenShiftGlusterFSImage}
openshift_storage_glusterfs_version:
yaql:
expression:
$.data.image.rightSplit(":", 1)[1]
data:
image: {get_param: DockerOpenShiftGlusterFSImage}
openshift_storage_glusterfs_block_image:
yaql:
expression:
$.data.image.rightSplit(":", 1)[0]
data:
image: {get_param: DockerOpenShiftGlusterFSBlockImage}
openshift_storage_glusterfs_block_version:
yaql:
expression:
$.data.image.rightSplit(":", 1)[1]
data:
image: {get_param: DockerOpenShiftGlusterFSBlockImage}
openshift_storage_glusterfs_heketi_image:
yaql:
expression:
$.data.image.rightSplit(":", 1)[0]
data:
image: {get_param: DockerOpenShiftGlusterFSHeketiImage}
openshift_storage_glusterfs_heketi_version:
yaql:
expression:
$.data.image.rightSplit(":", 1)[1]
data:
image: {get_param: DockerOpenShiftGlusterFSHeketiImage}
- openshift_storage_glusterfs_image: {get_param: DockerOpenShiftGlusterFSImage}
openshift_storage_glusterfs_block_image: {get_param: DockerOpenShiftGlusterFSBlockImage}
openshift_storage_glusterfs_heketi_image: {get_param: DockerOpenShiftGlusterFSHeketiImage}
- name: generate openshift gluster global vars
copy: