Browse Source

Merge branch 'master' into increase_timeout

pull/127/head
Antoine Legrand 8 years ago
parent
commit
7e94d31c8b
3 changed files with 9 additions and 2 deletions
  1. 8
      roles/kubernetes/preinstall/tasks/main.yml
  2. 1
      roles/kubernetes/preinstall/vars/centos.yml
  3. 2
      roles/network_plugin/tasks/calico.yml

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

@ -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

@ -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

@ -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

Loading…
Cancel
Save