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=-c

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

63381eb6b2fb6271d5d7c52a7ed8cea562ee441b
diff --combined apps/ceph/kubespray/playbooks/roles/install/tasks/main.yaml
index 6d3a676,2ff4191..4c4ebe9
--- a/apps/ceph/kubespray/playbooks/roles/install/tasks/main.yaml
+++ b/apps/ceph/kubespray/playbooks/roles/install/tasks/main.yaml
@@@ -76,6 -76,15 +76,15 @@@
    loop_control:
      loop_var: config_file
  
+ - name: Implement Workaround for connectivity problem - ping all tunnels
+   k8s:
+     state: present
+     definition: "{{ lookup('template', config_file) }}"
+   with_items:
+     - ping-tunnel-workaround.yaml.j2
+   loop_control:
+     loop_var: config_file
+ 
  - name: Wait until OPERATOR pod is available
    k8s_facts:
      kind: Pod
@@@ -88,7 -97,7 +97,7 @@@
    until:
      - rook_mgr_status.resources is defined
      - rook_mgr_status.resources
-   retries: 20
+   retries: 40
    delay: 5
  
  - name: Create rook cluster
@@@ -111,7 -120,7 +120,7 @@@
    register: rook_cluster_status
    until:
      - rook_cluster_status.resources
-   retries: 10
+   retries: 20
    delay: 5
  
  - name: Wait until MGR pods are available
@@@ -126,7 -135,7 +135,7 @@@
    until:
      - rook_mgr_status.resources is defined
      - rook_mgr_status.resources
-   retries: 30
+   retries: 40
    delay: 10
  
  - name: Wait until OSD pods are available
@@@ -141,7 -150,7 +150,7 @@@
    until:
      - rook_osd_status.resources is defined
      - rook_osd_status.resources
-   retries: 30
+   retries: 60
    delay: 10
  
  - name: Create rook block storage
@@@ -151,19 -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: