ceph: disable dashboard

Change-Id: I436761c4e14da72af87bd102d3146944c63b9f96
Signed-off-by: Cian Johnston <cian.johnston@est.tech>

diff --git a/apps/ceph/kubespray/playbooks/roles/common/vars/main.yml b/apps/ceph/kubespray/playbooks/roles/common/vars/main.yml
index 2f5eafa29684cbd3b642ac947b577a244890084b..195033c32451755b7e03f6513693148d03666586 100644 (file)
--- a/apps/ceph/kubespray/playbooks/roles/common/vars/main.yml
+++ b/apps/ceph/kubespray/playbooks/roles/common/vars/main.yml
@@ -56,4 +56,6 @@ rook_filesystem: "{{ lookup('env', 'ROOK_FS') | default('false', true) }}"
 rook_filesystem_name: "{{ lookup('env', 'ROOK_FILESYSTEM_NAME') | default('rookfs', true) }}"
 rook_filesystem_storageclass_name: "{{ lookup('env', 'ROOK_FILESYSTEM_STORAGECLASS_NAME') | default('csi-cephfs', true) }}"
 
 rook_filesystem_name: "{{ lookup('env', 'ROOK_FILESYSTEM_NAME') | default('rookfs', true) }}"
 rook_filesystem_storageclass_name: "{{ lookup('env', 'ROOK_FILESYSTEM_STORAGECLASS_NAME') | default('csi-cephfs', true) }}"
 

+rook_ceph_dashboard_enabled: "{{ lookup('env', 'ROOK_CEPH_DASHBOARD_ENABLED') | default(false, true) }}"
+

 # vim: set ts=2 sw=2 expandtab:
 # vim: set ts=2 sw=2 expandtab:

diff --git a/apps/ceph/kubespray/playbooks/roles/install/tasks/main.yaml b/apps/ceph/kubespray/playbooks/roles/install/tasks/main.yaml
index 044007cb19c9254a00a022d7f409fee680e961e2..60ed129e0d7a39cc60e48c64bd6af2dafee67381 100644 (file)
--- a/apps/ceph/kubespray/playbooks/roles/install/tasks/main.yaml
+++ b/apps/ceph/kubespray/playbooks/roles/install/tasks/main.yaml
@@ -195,5 +195,6 @@
   k8s:
     state: present
     definition: "{{ lookup('template', 'external-dashboard-https.yaml.j2') }}"
   k8s:
     state: present
     definition: "{{ lookup('template', 'external-dashboard-https.yaml.j2') }}"

+  when: rook_ceph_dashboard_enabled|bool

 
 # vim: set ts=2 sw=2 expandtab:
 
 # vim: set ts=2 sw=2 expandtab:

diff --git a/apps/ceph/kubespray/playbooks/roles/install/templates/cluster.yaml.j2 b/apps/ceph/kubespray/playbooks/roles/install/templates/cluster.yaml.j2
index c49d1c3c0588c921eba32e7ceaac02c67cf7d3d6..df8cd16f6884918d056d746146d0e4c84d197e72 100644 (file)
--- a/apps/ceph/kubespray/playbooks/roles/install/templates/cluster.yaml.j2
+++ b/apps/ceph/kubespray/playbooks/roles/install/templates/cluster.yaml.j2
@@ -75,7 +75,7 @@ spec:
     #   enabled: true
   # enable the ceph dashboard for viewing cluster status
   dashboard:
     #   enabled: true
   # enable the ceph dashboard for viewing cluster status
   dashboard:

-    enabled: true
+    enabled: {{ rook_ceph_dashboard_enabled }}

     # serve the dashboard under a subpath (useful when you are accessing the dashboard via a reverse proxy)
     # urlPrefix: /ceph-dashboard
     # serve the dashboard at the given port.
     # serve the dashboard under a subpath (useful when you are accessing the dashboard via a reverse proxy)
     # urlPrefix: /ceph-dashboard
     # serve the dashboard at the given port.