From: Andrew Fenner <Andrew.Fenner@est.tech>
Date: Fri, 31 Jul 2020 16:47:57 +0000 (+0000)
Subject: Merge "Add workaround for tunnel connectivity" into 1.15
X-Git-Url: https://gerrit.nordix.org/gitweb?p=infra%2Fstack%2Fkubernetes.git;a=commitdiff_plain;h=63381eb6b2fb6271d5d7c52a7ed8cea562ee441b;hp=b7924a953ce9f8769dfe1a3b1db65c92bf929275

Merge "Add workaround for tunnel connectivity" into 1.15
---

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 2ff4191..4c4ebe9 100644
--- a/apps/ceph/kubespray/playbooks/roles/install/tasks/main.yaml
+++ b/apps/ceph/kubespray/playbooks/roles/install/tasks/main.yaml
@@ -160,10 +160,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: