Adding Canal as CNI (#70)

* added canal template based on https://docs.projectcalico.org/v3.8/manifests/canal.yaml * Rename roles/cni/canal.yml.j2 to roles/cni/templates/canal.yml.j2 * added information about canal * Update reset-site.yaml
kairen · Oct 1, 2019 · 63250b1 · 63250b1
1 parent 0a27d5a
commit 63250b1
Show file tree

Hide file tree

Showing 3 changed files with 610 additions and 2 deletions.
diff --git a/group_vars/all.yml b/group_vars/all.yml
@@ -18,7 +18,7 @@ pod_network_cidr: "10.244.0.0/16"
 
 calico_etcd_service: "10.96.232.136"
 
-# Network implementation('flannel', 'calico')
+# Network implementation('flannel', 'calico', 'canal')
 network: calico
 
 # Change this to an appropriate interface, preferably a private network.

diff --git a/reset-site.yaml b/reset-site.yaml
@@ -10,7 +10,7 @@
 
     - name: Delete flannel.1 interface
       command: ip link delete flannel.1
-      when: network == "flannel"
+      when: network == "flannel" or network == "canal"
       ignore_errors: True
 
     - name: Delete cni0 interface