]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
dashboard: convert dashboard_rgw_api_no_ssl_verify to a bool
authorGuillaume Abrioux <gabrioux@redhat.com>
Wed, 15 May 2019 14:16:55 +0000 (16:16 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Fri, 17 May 2019 14:05:58 +0000 (16:05 +0200)
make `dashboard_rgw_api_no_ssl_verify` a bool variable since it seems to
be used as it.

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

group_vars/dashboards.yml.sample
roles/ceph-dashboard/defaults/main.yml
roles/ceph-dashboard/tasks/configure_dashboard.yml

index a5180a78173984633598de227f7b51c5eaca532e..94c9a5f40df4be4354f7afb742333252713490ae 100644 (file)
@@ -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
 
index c3838e083a70dc142eef8fb8a3e0b1dc9840391b..048dc75e76ca5e1601f39b39ba595a13c8a6c658 100644 (file)
@@ -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
index d61edd6c8da1d5a0f2481a0fba9c8f29d13d678d..1de6c25799243ae172d695d72a67658de8e7e8ae 100644 (file)
   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"