From 4d3f6c6533b0b3738046f0658155dce3447c4543 Mon Sep 17 00:00:00 2001 From: Smaine Kahlouch Date: Sun, 31 Jan 2016 21:05:49 +0100 Subject: [PATCH 1/2] install epel release for rhel install required packages before common roles/kubernetes/preinstall/tasks/main.yml --- roles/kubernetes/preinstall/tasks/main.yml | 8 ++++++++ roles/kubernetes/preinstall/vars/centos.yml | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml index 64dfff56e..365720ba9 100644 --- a/roles/kubernetes/preinstall/tasks/main.yml +++ b/roles/kubernetes/preinstall/tasks/main.yml @@ -52,6 +52,14 @@ ansible_distribution_major_version > 21 changed_when: False +- name: Install epel-release for RedHat and CentOS distribs + action: + module: "{{ ansible_pkg_mgr }}" + name: "epel-release" + state: latest + when: ansible_distribution == "RedHat" or + ansible_distribution == "CentOS" + - name: Install packages requirements action: module: "{{ ansible_pkg_mgr }}" diff --git a/roles/kubernetes/preinstall/vars/centos.yml b/roles/kubernetes/preinstall/vars/centos.yml index a42e8b580..c1be4b9b3 100644 --- a/roles/kubernetes/preinstall/vars/centos.yml +++ b/roles/kubernetes/preinstall/vars/centos.yml @@ -1,4 +1,3 @@ required_pkgs: - - epel-release - libselinux-python - device-mapper-libs From 3bb6066558ef42ef590cc5e88d85ef72398f88ee Mon Sep 17 00:00:00 2001 From: Smaine Kahlouch Date: Mon, 1 Feb 2016 09:47:51 +0100 Subject: [PATCH 2/2] add option '--nat-outgoing' for calico on clouds --- roles/network_plugin/tasks/calico.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network_plugin/tasks/calico.yml b/roles/network_plugin/tasks/calico.yml index 3c512501a..6e269c5eb 100644 --- a/roles/network_plugin/tasks/calico.yml +++ b/roles/network_plugin/tasks/calico.yml @@ -27,7 +27,7 @@ run_once: true - name: Calico | Configure calico network pool for cloud - command: "calicoctl pool add {{ kube_pods_subnet }} --ipip" + command: "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