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 7bd61b652de1a66c99017cf74c0ece17456c4454..efe56d9fc51918945b6a9c54e126df071f79e485 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -754,7 +754,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 66c932e47bab47a87e9eadc093e7da53bcd16ad2..6c2f03b9c9ed2e49953ceeef69c0686321f67f93 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -754,7 +754,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 86f6c47e243396c8d8e32dfedbc8d106eb84ceea..818ac134ef51cc6dd2ae0fd35cebad216f942ff8 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -746,7 +746,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