From: Guillaume Abrioux Date: Wed, 15 May 2019 14:16:55 +0000 (+0200) Subject: dashboard: convert dashboard_rgw_api_no_ssl_verify to a bool X-Git-Tag: v4.0.0rc8~5 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=567c6ceb43e2751dde735bccc5d5e9109ab6ad50;p=ceph-ansible.git dashboard: convert dashboard_rgw_api_no_ssl_verify to a bool make `dashboard_rgw_api_no_ssl_verify` a bool variable since it seems to be used as it. Signed-off-by: Guillaume Abrioux (cherry picked from commit cd5f3fca649ad823247f96e4060456ca44b1415e) --- diff --git a/group_vars/dashboards.yml.sample b/group_vars/dashboards.yml.sample index a5180a781..94c9a5f40 100644 --- a/group_vars/dashboards.yml.sample +++ b/group_vars/dashboards.yml.sample @@ -17,5 +17,5 @@ dummy: #dashboard_rgw_api_port: '' #dashboard_rgw_api_scheme: '' #dashboard_rgw_api_admin_resource: '' -#dashboard_rgw_api_no_ssl_verify: '' +#dashboard_rgw_api_no_ssl_verify: False diff --git a/roles/ceph-dashboard/defaults/main.yml b/roles/ceph-dashboard/defaults/main.yml index c3838e083..048dc75e7 100644 --- a/roles/ceph-dashboard/defaults/main.yml +++ b/roles/ceph-dashboard/defaults/main.yml @@ -9,4 +9,4 @@ dashboard_rgw_api_host: '' dashboard_rgw_api_port: '' dashboard_rgw_api_scheme: '' dashboard_rgw_api_admin_resource: '' -dashboard_rgw_api_no_ssl_verify: '' +dashboard_rgw_api_no_ssl_verify: False diff --git a/roles/ceph-dashboard/tasks/configure_dashboard.yml b/roles/ceph-dashboard/tasks/configure_dashboard.yml index d61edd6c8..1de6c2579 100644 --- a/roles/ceph-dashboard/tasks/configure_dashboard.yml +++ b/roles/ceph-dashboard/tasks/configure_dashboard.yml @@ -155,7 +155,7 @@ command: "{{ container_exec_cmd }} ceph dashboard set-rgw-api-ssl-verify False" changed_when: false delegate_to: "{{ groups[mon_group_name][0] }}" - when: dashboard_rgw_api_no_ssl_verify + when: dashboard_rgw_api_no_ssl_verify | bool - name: disable mgr dashboard module (restart) command: "{{ container_exec_cmd }} ceph mgr module disable dashboard"