From 152c40902247d451187f9d987efb915285f75183 Mon Sep 17 00:00:00 2001
From: Smana <smainklh@gmail.com>
Date: Sun, 21 Feb 2016 12:42:23 +0100
Subject: [PATCH] calico: enabling nat outgoing by default
---
roles/network_plugin/calico/defaults/main.yml | 2 ++
roles/network_plugin/calico/tasks/main.yml | 12 ++++++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml
index 9ee31209a..5aa701249 100644
--- a/roles/network_plugin/calico/defaults/main.yml
+++ b/roles/network_plugin/calico/defaults/main.yml
@@ -1,2 +1,4 @@
---
+# Enables Internet connectivity from containers
+nat_outgoing: true
# cloud_provider: no
diff --git a/roles/network_plugin/calico/tasks/main.yml b/roles/network_plugin/calico/tasks/main.yml
index 9f58b4609..d2f477032 100644
--- a/roles/network_plugin/calico/tasks/main.yml
+++ b/roles/network_plugin/calico/tasks/main.yml
@@ -48,15 +48,23 @@
register: calico_conf
run_once: true
+- name: Calico | Configure calico network pool
+ command: "{{ bin_dir }}/calicoctl pool add {{ kube_pods_subnet }}"
+ run_once: true
+ when: calico_conf.status == 404 and (cloud_provider is not defined or cloud_provider != True)
+ and not nat_outgoing|default(false) or
+ (nat_outgoing|default(false) and peer_with_router|default(false))
+
- name: Calico | Configure calico network pool for cloud
command: "{{ bin_dir }}/calicoctl pool add {{ kube_pods_subnet }} --ipip --nat-outgoing"
run_once: true
when: calico_conf.status == 404 and cloud_provider is defined and cloud_provider == True
-- name: Calico | Configure calico network pool
- command: "{{ bin_dir }}/calicoctl pool add {{ kube_pods_subnet }}"
+- name: Calico | Configure calico network pool with nat outgoing
+ command: "{{ bin_dir}}/calicoctl pool add {{ kube_pods_subnet }} --nat-outgoing"
run_once: true
when: calico_conf.status == 404 and (cloud_provider is not defined or cloud_provider != True)
+ and nat_outgoing|default(false) and not peer_with_router|default(false)
- name: Calico | Get calico configuration from etcd
uri:
--
GitLab