Merge pull request #462 from kubespray/calicodefaultpool

Disable calicoctl from creating a default pool
2016-08-31 11:58:37 +02:00 · 2016-08-31 11:58:37 +02:00 · 26f326c604
commit 26f326c604
parent cb6def8fee 0847e893ca
1 changed files with 2 additions and 0 deletions
--- a/roles/network_plugin/calico/tasks/main.yml
+++ b/roles/network_plugin/calico/tasks/main.yml
@ -73,6 +73,8 @@

 - 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('') }}"
+  environment:
+    NO_DEFAULT_POOLS: true
  run_once: true
  when: calico_conf.status == 404