Add Shared Storage as optional

In some setups there will be no shared storage configured.
The current playbooks will always create a cephfs Storage Class,
this change will make it optional and controlled from a variable.

Change-Id: I70a57e50cd0ecdc4ac300d46e1d269ebcb90a5aa

diff --git a/apps/ceph/kubespray/playbooks/roles/common/vars/main.yml b/apps/ceph/kubespray/playbooks/roles/common/vars/main.yml
index 933075ae554e0a7fe3d23bf61d3b35c2afd0282a..bc0decb67bb2c05d93279a65f9e83ac8cdc13cbe 100644 (file)
--- a/apps/ceph/kubespray/playbooks/roles/common/vars/main.yml
+++ b/apps/ceph/kubespray/playbooks/roles/common/vars/main.yml
@@ -31,5 +31,6 @@ rook_block_pool_replicas: 1
 rook_block_storage_name: "block-storage"
 rook_block_storage_fs: "xfs"
 
+rook_filesystem: "{{ lookup('env', 'ROOK_FS') | default('false', true) }}"
 rook_filesystem_name: "rookfs"
 rook_filesystem_storageclass_name: "csi-cephfs"

diff --git a/apps/ceph/kubespray/playbooks/roles/install/tasks/main.yaml b/apps/ceph/kubespray/playbooks/roles/install/tasks/main.yaml
index b977018025287c576a429692c0f62c11c0269e37..6d3a676aa0d2c91bc1a7c923ea18ddfff8ead747 100644 (file)
--- a/apps/ceph/kubespray/playbooks/roles/install/tasks/main.yaml
+++ b/apps/ceph/kubespray/playbooks/roles/install/tasks/main.yaml
@@ -151,10 +151,19 @@
   with_items:
     - pool.yaml.j2
     - storageclass.yaml.j2
+  loop_control:
+    loop_var: config_file
+
+- name: Create rook file system
+  k8s:
+    state: present
+    definition: "{{ lookup('template', config_file) }}"
+  with_items:
     - filesystem.yaml.j2
     - filesystem-storageclass.yaml.j2
   loop_control:
     loop_var: config_file
+  when: rook_filesystem|bool
 
 - name: Create rook external dashboard
   k8s: