diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-17 14:49:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-17 14:49:21 -0400 |
| commit | cf1aa0e3bc4bc207a0da718695326b6850b90610 (patch) | |
| tree | 3ac2b389a1c39255f806de8c0ac2dd2254b70ffb /roles/calico/defaults | |
| parent | 1827ab832d47abcedeceafb9098fbcfaa19b4bd5 (diff) | |
| parent | 7a57517cf59ff77f19f8c58f44f2880f151e95b2 (diff) | |
| download | openshift-cf1aa0e3bc4bc207a0da718695326b6850b90610.tar.gz openshift-cf1aa0e3bc4bc207a0da718695326b6850b90610.tar.bz2 openshift-cf1aa0e3bc4bc207a0da718695326b6850b90610.tar.xz openshift-cf1aa0e3bc4bc207a0da718695326b6850b90610.zip | |
Merge pull request #5111 from ozdanborne/calico-default-pool
Use sdn_cluster_network_cidr as default calico pool
Diffstat (limited to 'roles/calico/defaults')
| -rw-r--r-- | roles/calico/defaults/main.yaml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/roles/calico/defaults/main.yaml b/roles/calico/defaults/main.yaml index e7a9db92f..03c96be36 100644 --- a/roles/calico/defaults/main.yaml +++ b/roles/calico/defaults/main.yaml @@ -9,7 +9,6 @@ calico_url_cni: "https://github.com/projectcalico/cni-plugin/releases/download/v calico_url_ipam: "https://github.com/projectcalico/cni-plugin/releases/download/v1.10.0/calico-ipam" calico_ipv4pool_ipip: "always" -calico_ipv4pool_cidr: "192.168.0.0/16" calico_log_dir: "/var/log/calico" calico_node_image: "calico/node:v2.4.1" |