summaryrefslogtreecommitdiffstats
path: root/roles/calico_master
diff options
context:
space:
mode:
authorJan Chaloupka <jchaloup@redhat.com>2017-05-19 11:52:51 +0200
committerGitHub <noreply@github.com>2017-05-19 11:52:51 +0200
commit3ddeebe66c59725077cdb712f93b30c6f139023f (patch)
treef37a30af83d2ef062f0c6788b3a79f413fb54710 /roles/calico_master
parentb99fa6451827088bf1a688dcad19f69de7fecbd1 (diff)
parent0cb1bdb9b8debd0ef2ece17146ae87d6fb03f6c2 (diff)
downloadopenshift-3ddeebe66c59725077cdb712f93b30c6f139023f.tar.gz
openshift-3ddeebe66c59725077cdb712f93b30c6f139023f.tar.bz2
openshift-3ddeebe66c59725077cdb712f93b30c6f139023f.tar.xz
openshift-3ddeebe66c59725077cdb712f93b30c6f139023f.zip
Merge pull request #4145 from VincentS/Calico_Parameterization
Parameterized Calico/Node Arguments
Diffstat (limited to 'roles/calico_master')
-rw-r--r--roles/calico_master/README.md12
1 files changed, 12 insertions, 0 deletions
diff --git a/roles/calico_master/README.md b/roles/calico_master/README.md
index 2d34a967c..6f5ed0664 100644
--- a/roles/calico_master/README.md
+++ b/roles/calico_master/README.md
@@ -21,6 +21,18 @@ To install, set the following inventory configuration parameters:
* `os_sdn_network_plugin_name='cni'`
+
+## Additional Calico/Node and Felix Configuration Options
+
+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 |
+
### Contact Information
Author: Dan Osborne <dan@projectcalico.org>