From 896230cb1aec91b770e20d4175ef9498e6de98cb Mon Sep 17 00:00:00 2001 From: Ignacio Pascual Date: Wed, 22 Jul 2020 15:57:51 +0200 Subject: [PATCH] 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 --- apps/ceph/kubespray/playbooks/roles/common/vars/main.yml | 1 + .../kubespray/playbooks/roles/install/tasks/main.yaml | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/apps/ceph/kubespray/playbooks/roles/common/vars/main.yml b/apps/ceph/kubespray/playbooks/roles/common/vars/main.yml index 933075a..bc0decb 100644 --- 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 b977018..6d3a676 100644 --- 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: -- 2.25.1