Merge pull request #462 from kubespray/calicodefaultpool

Disable calicoctl from creating a default pool
This commit is contained in:
Smaine Kahlouch 2016-08-31 11:58:37 +02:00 committed by GitHub
commit 1c1894cdd3

View file

@ -73,6 +73,8 @@
- name: Calico | Configure calico network pool {{ pool_task_name|default('') }} - name: Calico | Configure calico network pool {{ pool_task_name|default('') }}
command: "{{ bin_dir}}/calicoctl pool add {{ kube_pods_subnet }} {{ ipip_arg|default('') }} {{ nat_arg|default('') }}" command: "{{ bin_dir}}/calicoctl pool add {{ kube_pods_subnet }} {{ ipip_arg|default('') }} {{ nat_arg|default('') }}"
environment:
NO_DEFAULT_POOLS: true
run_once: true run_once: true
when: calico_conf.status == 404 when: calico_conf.status == 404