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

ceph-defaults: pin grafana container tag to 5.2.4 

The latest grafana container tag is using grafana 6.x release which could
cause issue with the ceph dashboard integration.
Considering that the grafana container in RHCS 3 is based on 5.x then we
should use the same version.

$ docker run --rm rhceph/rhceph-3-dashboard-rhel7:3 -v
Version 5.2.4 (commit: unknown-dev)

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 2037fb87b6)
pull/4708/head v4.0.5
Dimitri Savineau 2019-10-31 11:37:20 -04:00 committed by Dimitri Savineau
parent 27eb40714c
commit 0dcaec64ec
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all.yml.sample
View File

@ -722,7 +722,7 @@ dummy:
# 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: "grafana/grafana:latest" #grafana_container_image: "grafana/grafana:5.2.4"
#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

2
roles/ceph-defaults/defaults/main.yml
View File

@ -714,7 +714,7 @@ grafana_admin_password: admin
# 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: "grafana/grafana:latest" grafana_container_image: "grafana/grafana:5.2.4"
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