openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Use openshift_cockpit_deployer_image directly 

The openshift_cockpit_deployer_image variable is built from the
other variables we have below in openshift-ansible[1]. However, it is
currently failing to resolve correctly. Instead, we can just pass
the var ourselves rather than rely on openshift-ansible to correctly
construct it.

[1] https://github.com/openshift/openshift-ansible/blob/openshift-ansible-3.10.41-1/roles/cockpit-ui/defaults/main.yml#L19

Change-Id: I46755c3f66310fa2854f628bf5f129930f407761
This commit is contained in:
trown 2018-09-12 12:04:18 -04:00
parent 860c9a33f7
commit 7f2276b87f
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
extraconfig/services/openshift-master.yaml
View File

@ -149,24 +149,7 @@ outputs:
osm_etcd_image: {get_param: DockerOpenShiftEtcdImage}
osm_image: {get_param: DockerOpenShiftBaseImage}
osn_image: {get_param: DockerOpenShiftNodeImage}
openshift_cockpit_deployer_prefix:
yaql:
expression:
$.data.image.rightSplit("/", 1)[0] + "/"
data:
image: {get_param: DockerOpenShiftCockpitImage}
openshift_cockpit_deployer_basename:
yaql:
expression:
$.data.image.rightSplit(":", 1)[0].rightSplit("/", 1)[1]
data:
image: {get_param: DockerOpenShiftCockpitImage}
openshift_cockpit_deployer_version:
yaql:
expression:
$.data.image.rightSplit(":", 1)[1]
data:
image: {get_param: DockerOpenShiftCockpitImage}
openshift_cockpit_deployer_image: {get_param: DockerOpenShiftCockpitImage}
openshift_web_console_prefix:
yaql:
expression: