openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Set container images for openshift 3.11"

Browse Source
This commit is contained in:
Zuul 2019-01-17 22:25:55 +00:00 committed by Gerrit Code Review
commit f228e94efa
1 changed files with 98 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,6 +97,42 @@ parameters:
DockerOpenShiftAnsibleServiceBrokerImage: DockerOpenShiftAnsibleServiceBrokerImage:
description: Ansible Service Broker image for openshift description: Ansible Service Broker image for openshift
type: string 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: resources:
@ -188,6 +224,68 @@ outputs:
osn_image: {get_param: DockerOpenShiftNodeImage} osn_image: {get_param: DockerOpenShiftNodeImage}
openshift_cockpit_deployer_image: {get_param: DockerOpenShiftCockpitImage} openshift_cockpit_deployer_image: {get_param: DockerOpenShiftCockpitImage}
ansible_service_broker_image: {get_param: DockerOpenShiftAnsibleServiceBrokerImage} 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} - {get_param: OpenShiftGlobalVariables}
tripleo_stack_action: {get_param: StackAction} tripleo_stack_action: {get_param: StackAction}
openshift_master_node_vars: {get_param: OpenShiftMasterNodeVars} openshift_master_node_vars: {get_param: OpenShiftMasterNodeVars}