ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rhcs_edits: Fix ose container versions 

For some reason, the floating tags were changed from v4.1 to just 4.1
for these images when switching ti registry.redhat.io. We should fix
the locations.

We are also changing the downstream grafana image to the one we used for
rhcs 3. The ose grafana image lacks the support for a lot of features
that we need (e.g. vonage and piechart grafana plugins, grafana-cli
binary and others).

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit f067e53c6e)
pull/4503/head
Boris Ranto 2019-09-27 11:50:54 +02:00 committed by Guillaume Abrioux
parent 4f806786da
commit 7c0a20e456
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
group_vars/rhcs.yml.sample
View File

@ -723,7 +723,7 @@ node_exporter_container_image: registry.redhat.io/openshift4/ose-prometheus-node
# We only need this for SSL (https) connections # We only need this for SSL (https) connections
#grafana_crt: '' #grafana_crt: ''
#grafana_key: '' #grafana_key: ''
grafana_container_image: registry.redhat.io/openshift4/ose-grafana:v4.1 grafana_container_image: registry.redhat.io/rhceph/rhceph-3-dashboard-rhel7:3
#grafana_container_cpu_period: 100000 #grafana_container_cpu_period: 100000
#grafana_container_cpu_cores: 2 #grafana_container_cpu_cores: 2
# container_memory is in GB # container_memory is in GB
@ -749,7 +749,7 @@ grafana_container_image: registry.redhat.io/openshift4/ose-grafana:v4.1
# - grafana-piechart-panel # - grafana-piechart-panel
#grafana_allow_embedding: True #grafana_allow_embedding: True
#grafana_port: 3000 #grafana_port: 3000
prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:v4.1 prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:4.1
#prometheus_container_cpu_period: 100000 #prometheus_container_cpu_period: 100000
#prometheus_container_cpu_cores: 2 #prometheus_container_cpu_cores: 2
# container_memory is in GB # container_memory is in GB
@ -758,7 +758,7 @@ prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:v4.1
#prometheus_conf_dir: /etc/prometheus #prometheus_conf_dir: /etc/prometheus
#prometheus_user_id: '65534' # This is the UID used by the prom/prometheus container image #prometheus_user_id: '65534' # This is the UID used by the prom/prometheus container image
#prometheus_port: 9090 #prometheus_port: 9090
alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:v4.1 alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:4.1
#alertmanager_container_cpu_period: 100000 #alertmanager_container_cpu_period: 100000
#alertmanager_container_cpu_cores: 2 #alertmanager_container_cpu_cores: 2
# container_memory is in GB # container_memory is in GB

6
rhcs_edits.txt
View File

@ -7,7 +7,7 @@ ceph_docker_image_tag: "latest"
ceph_docker_registry: "registry.redhat.io" ceph_docker_registry: "registry.redhat.io"
ceph_docker_registry_auth: true ceph_docker_registry_auth: true
node_exporter_container_image: registry.redhat.io/openshift4/ose-prometheus-node-exporter:v4.1 node_exporter_container_image: registry.redhat.io/openshift4/ose-prometheus-node-exporter:v4.1
grafana_container_image: registry.redhat.io/openshift4/ose-grafana:v4.1 grafana_container_image: registry.redhat.io/rhceph/rhceph-3-dashboard-rhel7:3
prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:v4.1 prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:4.1
alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:v4.1 alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:4.1
# END OF FILE, DO NOT TOUCH ME! # END OF FILE, DO NOT TOUCH ME!