From e737a1f83edbdda09663f18c55841befb21ffdfd Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Thu, 4 Apr 2019 19:51:16 +0200 Subject: [PATCH] dashboard: Set ssl_server_port if it is supported We cannot use the old fashioned config-key way, here. It was not supported when the option was introduced (post 14.2.0). Since the option is not always supported we can simply ignore the potential failure on ceph clusters that do not support it. Signed-off-by: Boris Ranto --- roles/ceph-dashboard/tasks/configure_dashboard.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/ceph-dashboard/tasks/configure_dashboard.yml b/roles/ceph-dashboard/tasks/configure_dashboard.yml index 4780e03f0..3ec760c1d 100644 --- a/roles/ceph-dashboard/tasks/configure_dashboard.yml +++ b/roles/ceph-dashboard/tasks/configure_dashboard.yml @@ -77,6 +77,10 @@ {{ mgr_prefix }} ceph config set mgr mgr/dashboard/server_port {{ dashboard_port }} || \ {{ mgr_prefix }} ceph config-key set mgr/dashboard/server_port {{ dashboard_port }} +- name: "set the dashboard SSL port ({{ dashboard_port }})" + command: "{{ mgr_prefix }} ceph config set mgr mgr/dashboard/ssl_server_port {{ dashboard_port }}" # Do not use the old fashioned config-key way ssl_server_port, it was not supported when this option was introduced + failed_when: false # Do not fail if the option does not exist, it only exists post-14.2.0 + - name: disable mgr dashboard module (restart) command: "{{ mgr_prefix }} ceph mgr module disable dashboard" changed_when: false