epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 09:39:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into increase_timeout

Browse Source
This commit is contained in:
Antoine Legrand
2016-02-01 14:32:25 +01:00
parent 21b0a3649d 896f59267a
commit 7e94d31c8b
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/kubernetes/preinstall/tasks/main.yml
View File

@@ -52,6 +52,14 @@
ansible_distribution_major_version > 21 ansible_distribution_major_version > 21
changed_when: False 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 - name: Install packages requirements
action: action:
module: "{{ ansible_pkg_mgr }}" module: "{{ ansible_pkg_mgr }}"

1
roles/kubernetes/preinstall/vars/centos.yml
View File

@@ -1,4 +1,3 @@
required_pkgs: required_pkgs:
- epel-release
- libselinux-python - libselinux-python
- device-mapper-libs - device-mapper-libs

2
roles/network_plugin/tasks/calico.yml
View File

@@ -27,7 +27,7 @@
run_once: true run_once: true
- name: Calico | Configure calico network pool for cloud - 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 run_once: true
when: calico_conf.status == 404 and cloud_provider is defined and cloud_provider == True when: calico_conf.status == 404 and cloud_provider is defined and cloud_provider == True