From ab6395a644d24e0d0fe9050e6244ad1094d61400 Mon Sep 17 00:00:00 2001 From: Mike Fedosin Date: Wed, 24 Oct 2018 22:59:35 +0200 Subject: [PATCH] Set container images for openshift 3.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wire in the new openshift 3.11 images with tripleo, so that any customization applied either via heat param with the integrated image preparation workflow gets passed to openshift-ansible. Depends-On: Ibbd5ff9d3597f5add440b92a27a2f2f669f7bdbe Co-Authored-By: Martin André Change-Id: I2cb6eac9136f4c24bfc2881ff0aa1ddec7a35fe4 --- extraconfig/services/openshift-master.yaml | 98 ++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml index a431524354..8af860c1b4 100644 --- a/extraconfig/services/openshift-master.yaml +++ b/extraconfig/services/openshift-master.yaml @@ -97,6 +97,42 @@ parameters: DockerOpenShiftAnsibleServiceBrokerImage: description: Ansible Service Broker image for openshift type: string + DockerOpenShiftConsoleImage: + description: console container image for openshift + type: string + DockerOpenShiftPrometheusNodeExporterImage: + description: prometheus node exporter container image for openshift + type: string + DockerOpenShiftKubeRbacProxyImage: + description: kube rbac proxy container image for openshift + type: string + DockerOpenShiftClusterMonitorOperatorImage: + description: cluster monitoring operator container image for openshift + type: string + DockerOpenShiftConfigmapReloaderImage: + description: configmap reloader container image for openshift + type: string + DockerOpenShiftPrometheusOperatorImage: + description: prometheus operator container image for openshift + type: string + DockerOpenShiftPrometheusConfigReloaderImage: + description: prometheus config reloader container image for openshift + type: string + DockerOpenShiftPrometheusImage: + description: prometheus container image for openshift + type: string + DockerOpenShiftPrometheusAlertmanagerImage: + description: prometheus alertmanager container image for openshift + type: string + DockerOpenShiftOauthProxyImage: + description: oauth proxy container image for openshift + type: string + DockerOpenShiftKubeStateMetricsImage: + description: kube state metrics container image for openshift + type: string + DockerOpenShiftGrafanaImage: + description: grafana container image for openshift + type: string resources: @@ -188,6 +224,68 @@ outputs: osn_image: {get_param: DockerOpenShiftNodeImage} openshift_cockpit_deployer_image: {get_param: DockerOpenShiftCockpitImage} ansible_service_broker_image: {get_param: DockerOpenShiftAnsibleServiceBrokerImage} + openshift_console_image_name: {get_param: DockerOpenShiftConsoleImage} + openshift_cluster_monitoring_operator_image: {get_param: DockerOpenShiftClusterMonitorOperatorImage} + openshift_cluster_monitoring_operator_node_exporter_repo: + yaql: + expression: + $.data.image.rightSplit(":", 1)[0] + data: + image: {get_param: DockerOpenShiftPrometheusNodeExporterImage} + openshift_cluster_monitoring_operator_kube_rbac_proxy_image: + yaql: + expression: + $.data.image.rightSplit(":", 1)[0] + data: + image: {get_param: DockerOpenShiftKubeRbacProxyImage} + openshift_cluster_monitoring_operator_configmap_reloader_repo: + yaql: + expression: + $.data.image.rightSplit(":", 1)[0] + data: + image: {get_param: DockerOpenShiftConfigmapReloaderImage} + openshift_cluster_monitoring_operator_prometheus_operator_repo: + yaql: + expression: + $.data.image.rightSplit(":", 1)[0] + data: + image: {get_param: DockerOpenShiftPrometheusOperatorImage} + openshift_cluster_monitoring_operator_prometheus_reloader_repo: + yaql: + expression: + $.data.image.rightSplit(":", 1)[0] + data: + image: {get_param: DockerOpenShiftPrometheusConfigReloaderImage} + openshift_cluster_monitoring_operator_prometheus_repo: + yaql: + expression: + $.data.image.rightSplit(":", 1)[0] + data: + image: {get_param: DockerOpenShiftPrometheusImage} + openshift_cluster_monitoring_operator_alertmanager_repo: + yaql: + expression: + $.data.image.rightSplit(":", 1)[0] + data: + image: {get_param: DockerOpenShiftPrometheusAlertmanagerImage} + openshift_cluster_monitoring_operator_proxy_image: + yaql: + expression: + $.data.image.rightSplit(":", 1)[0] + data: + image: {get_param: DockerOpenShiftOauthProxyImage} + openshift_cluster_monitoring_operator_kube_state_metrics_image: + yaql: + expression: + $.data.image.rightSplit(":", 1)[0] + data: + image: {get_param: DockerOpenShiftKubeStateMetricsImage} + openshift_cluster_monitoring_operator_grafana_image: + yaql: + expression: + $.data.image.rightSplit(":", 1)[0] + data: + image: {get_param: DockerOpenShiftGrafanaImage} - {get_param: OpenShiftGlobalVariables} tripleo_stack_action: {get_param: StackAction} openshift_master_node_vars: {get_param: OpenShiftMasterNodeVars}