ceph-defaults: update grafana container tag

Since 8e8aa73 we're using grafana 5.4.3 in RHCS 4.1 via [1].
We should also update the grafana container tag from docker.io when
using the community release.

[1] registry.redhat.io/rhceph/rhceph-4-dashboard-rhel8:4

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit b97a4d520158319a12c06ac169f645f733e47cd9)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 272c042734254b235ec45aa1d056e61ea53bf27e..a4cc2ddd0440a99241293c8b0bc14c7ea2fe04d9 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -766,7 +766,7 @@ dummy:
 # We only need this for SSL (https) connections
 #grafana_crt: ''
 #grafana_key: ''
-#grafana_container_image: "grafana/grafana:5.2.4"
+#grafana_container_image: "grafana/grafana:5.4.3"
 #grafana_container_cpu_period: 100000
 #grafana_container_cpu_cores: 2
 # container_memory is in GB

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 2fd6f9937f3913fc0c155a9f9d3e653e00f14060..71023d5304980e3ef5d8ec49f55a6b758e5def92 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -758,7 +758,7 @@ grafana_admin_user: admin
 # We only need this for SSL (https) connections
 grafana_crt: ''
 grafana_key: ''
-grafana_container_image: "grafana/grafana:5.2.4"
+grafana_container_image: "grafana/grafana:5.4.3"
 grafana_container_cpu_period: 100000
 grafana_container_cpu_cores: 2
 # container_memory is in GB