Merge branch 'master' into increase_timeout

This commit is contained in:
Antoine Legrand 2016-02-01 14:32:25 +01:00
commit 7e94d31c8b
3 changed files with 9 additions and 2 deletions

View file

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

View file

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

View file

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