From 7b7f20c636c12a02c0452c977e7952716fc9edcb Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 3 Nov 2020 16:32:17 +0100 Subject: [PATCH] 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 (cherry picked from commit 5cadfea42e8dd31e019568cdfe1b0f3d64f5dcc4) --- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 2 +- roles/ceph-defaults/defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index f99365785..f7c6fbfb3 100644 --- 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 a0b609ab1..91617f7fc 100644 --- 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 f9fb3777e..cbcda5b70 100644 --- 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