From: Dimitri Savineau Date: Mon, 16 Mar 2020 21:52:30 +0000 (-0400) Subject: ceph-defaults: update grafana container tag X-Git-Tag: v4.0.17~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf9d628b65682fff0397cb4516e0a6fff131c99f;p=ceph-ansible.git 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 (cherry picked from commit b97a4d520158319a12c06ac169f645f733e47cd9) --- diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 272c04273..a4cc2ddd0 100644 --- 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 2fd6f9937..71023d530 100644 --- 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