From cc79125d3e432ba601c0f9cda2e5402ac167f68f Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <matthew.mosesohn@gmail.com>
Date: Wed, 12 Sep 2018 17:03:55 +0300
Subject: [PATCH] Update install.yml

---
 roles/network_plugin/calico/tasks/install.yml | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml
index dd72ff323..a292e3748 100644
--- a/roles/network_plugin/calico/tasks/install.yml
+++ b/roles/network_plugin/calico/tasks/install.yml
@@ -151,8 +151,8 @@
   command: "{{ bin_dir}}/calicoctl config set asNumber {{ global_as_num }}"
   run_once: true
   when:
-   - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
-   - not calico_upgrade_enabled
+    - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
+    - not calico_upgrade_enabled
 
 - name: Calico | Disable node mesh (legacy)
   command: "{{ bin_dir }}/calicoctl config set nodeToNodeMesh off"
@@ -161,7 +161,6 @@
     - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
     - not calico_upgrade_enabled
     - nodeToMeshEnabled|default(True)
-  run_once: true
 
 - name: Calico | Configure peering with router(s)
   shell: >
@@ -199,10 +198,10 @@
   delay: "{{ retry_stagger | random + 3 }}"
   with_items: "{{ peers|default([]) }}"
   when:
-   - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
-   - not calico_upgrade_enabled
-   - peer_with_router|default(false)
-   - inventory_hostname in groups['k8s-cluster']
+    - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
+    - not calico_upgrade_enabled
+    - peer_with_router|default(false)
+    - inventory_hostname in groups['k8s-cluster']
 
 - name: Calico | Configure peering with route reflectors
   shell: >
@@ -243,10 +242,10 @@
   delay: "{{ retry_stagger | random + 3 }}"
   with_items: "{{ groups['calico-rr'] | default([]) }}"
   when:
-   - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
-   - not calico_upgrade_enabled
-   - peer_with_calico_rr|default(false)
-   - hostvars[item]['cluster_id'] == cluster_id
+    - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
+    - not calico_upgrade_enabled
+    - peer_with_calico_rr|default(false)
+    - hostvars[item]['cluster_id'] == cluster_id
 
 
 - name: Calico | Create calico manifests