From 7f2276b87f5c984ba74d6c7216dd9e6a5d9dfa98 Mon Sep 17 00:00:00 2001 From: trown Date: Wed, 12 Sep 2018 12:04:18 -0400 Subject: [PATCH] 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 --- extraconfig/services/openshift-master.yaml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml index 1dd4044cbe..11f6ffd0c1 100644 --- a/extraconfig/services/openshift-master.yaml +++ b/extraconfig/services/openshift-master.yaml @@ -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: