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_master | |
| 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_master')
| -rw-r--r-- | roles/calico_master/README.md | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/roles/calico_master/README.md b/roles/calico_master/README.md index 6f5ed0664..88fd44086 100644 --- a/roles/calico_master/README.md +++ b/roles/calico_master/README.md @@ -29,7 +29,6 @@ Additional parameters that can be defined in the inventory are: | Environment | Description | Schema | Default | |---------|----------------------|---------|---------| -|CALICO_IPV4POOL_CIDR| The IPv4 Pool to create if none exists at start up. It is invalid to define this variable and NO_DEFAULT_POOLS. |IPv4 CIDR | 192.168.0.0/16 | | CALICO_IPV4POOL_IPIP | IPIP Mode to use for the IPv4 POOL created at start up. | off, always, cross-subnet | always | | CALICO_LOG_DIR | Directory on the host machine where Calico Logs are written.| String | /var/log/calico | |