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 f067e53c6efc602a09ca6415cae05ec825bdc9de)

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 0f7072bbdf88a412fed0c2b3eb3f60b6c7905d52..3295bf39dba7f129991a681c664c82b0b355a5c1 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -723,7 +723,7 @@ node_exporter_container_image: registry.redhat.io/openshift4/ose-prometheus-node
 # We only need this for SSL (https) connections
 #grafana_crt: ''
 #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_cores: 2
 # container_memory is in GB
@@ -749,7 +749,7 @@ grafana_container_image: registry.redhat.io/openshift4/ose-grafana:v4.1
 #  - grafana-piechart-panel
 #grafana_allow_embedding: True
 #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_cores: 2
 # 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_user_id: '65534'  # This is the UID used by the prom/prometheus container image
 #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_cores: 2
 # container_memory is in GB

diff --git a/rhcs_edits.txt b/rhcs_edits.txt
index 9fba033c52d92adb3fb9d594401adb07e0943b5f..76dc6133418f859d808920d13c343e74e79fafb6 100644 (file)
--- a/rhcs_edits.txt
+++ b/rhcs_edits.txt
@@ -7,7 +7,7 @@ ceph_docker_image_tag: "latest"
 ceph_docker_registry: "registry.redhat.io"
 ceph_docker_registry_auth: true
 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
-prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:v4.1
-alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:v4.1
+grafana_container_image: registry.redhat.io/rhceph/rhceph-3-dashboard-rhel7:3
+prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:4.1
+alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:4.1
 # END OF FILE, DO NOT TOUCH ME!