dashboard: change dashboard_grafana_api_no_ssl_verify default value

This sets the `dashboard_grafana_api_no_ssl_verify` default value
according to the length of `dashboard_crt` and `dashboard_key`.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 5cadfea42e8dd31e019568cdfe1b0f3d64f5dcc4)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index f993657857e84b0c949678af4966bcd98f8be4bf..f7c6fbfb3a97cc6f2ab66c6ad479d5d2fc53209b 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -656,7 +656,7 @@ dummy:
 #dashboard_crt: ''
 #dashboard_key: ''
 #dashboard_tls_external: false
-#dashboard_grafana_api_no_ssl_verify: False
+#dashboard_grafana_api_no_ssl_verify: "{{ true if dashboard_protocol == 'https' and not grafana_crt and not grafana_key else false }}"
 #dashboard_rgw_api_user_id: ceph-dashboard
 #dashboard_rgw_api_admin_resource: ''
 #dashboard_rgw_api_no_ssl_verify: False

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index a0b609ab1fc8cbb690f8e6419e9a2bd04e8ef2a6..91617f7fc2d03109e9a597ce6dbac56781463c9e 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -656,7 +656,7 @@ ceph_docker_registry_auth: true
 #dashboard_crt: ''
 #dashboard_key: ''
 #dashboard_tls_external: false
-#dashboard_grafana_api_no_ssl_verify: False
+#dashboard_grafana_api_no_ssl_verify: "{{ true if dashboard_protocol == 'https' and not grafana_crt and not grafana_key else false }}"
 #dashboard_rgw_api_user_id: ceph-dashboard
 #dashboard_rgw_api_admin_resource: ''
 #dashboard_rgw_api_no_ssl_verify: False

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index f9fb3777e49f0b268f4cc61d0a03fb29c314c8f9..cbcda5b705982523c6367139161bc462ade9a62b 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -648,7 +648,7 @@ dashboard_admin_user_ro: false
 dashboard_crt: ''
 dashboard_key: ''
 dashboard_tls_external: false
-dashboard_grafana_api_no_ssl_verify: False
+dashboard_grafana_api_no_ssl_verify: "{{ true if dashboard_protocol == 'https' and not grafana_crt and not grafana_key else false }}"
 dashboard_rgw_api_user_id: ceph-dashboard
 dashboard_rgw_api_admin_resource: ''
 dashboard_rgw_api_no_ssl_verify: False