From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 3 Nov 2020 12:49:59 +0000 (+0100)
Subject: dashboard: enable https by default
X-Git-Tag: v4.0.38~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c9b7e462138718fd3f2230d3b270325f2d82c8fe;p=ceph-ansible.git

dashboard: enable https by default

see linked bz for details

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1889426

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

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 08721830e..7bd61b652 100644
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -742,7 +742,9 @@ dummy:
 #dashboard_enabled: True
 # Choose http or https
 # For https, you should set dashboard.crt/key and grafana.crt/key
-#dashboard_protocol: http
+# If you define the dashboard_crt and dashboard_key variables, but leave them as '',
+# then we will autogenerate a cert and keyfile
+#dashboard_protocol: https
 #dashboard_port: 8443
 #dashboard_admin_user: admin
 #dashboard_admin_user_ro: false
diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index d0ba2bf36..66c932e47 100644
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -742,7 +742,9 @@ ceph_docker_registry_auth: true
 #dashboard_enabled: True
 # Choose http or https
 # For https, you should set dashboard.crt/key and grafana.crt/key
-#dashboard_protocol: http
+# If you define the dashboard_crt and dashboard_key variables, but leave them as '',
+# then we will autogenerate a cert and keyfile
+#dashboard_protocol: https
 #dashboard_port: 8443
 #dashboard_admin_user: admin
 #dashboard_admin_user_ro: false
diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 7a516b0dd..86f6c47e2 100644
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -734,7 +734,9 @@ openstack_keys:
 dashboard_enabled: True
 # Choose http or https
 # For https, you should set dashboard.crt/key and grafana.crt/key
-dashboard_protocol: http
+# If you define the dashboard_crt and dashboard_key variables, but leave them as '',
+# then we will autogenerate a cert and keyfile
+dashboard_protocol: https
 dashboard_port: 8443
 dashboard_admin_user: admin
 dashboard_admin_user_ro: false