openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use openshift_cockpit_deployer_image directly"

This commit is contained in:
Zuul 2018-09-20 20:41:53 +00:00 committed by Gerrit Code Review
parent 4fb146fb79 7f2276b87f
commit a45a5f7ac6
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: