diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-19 11:52:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-19 11:52:51 +0200 |
| commit | 3ddeebe66c59725077cdb712f93b30c6f139023f (patch) | |
| tree | f37a30af83d2ef062f0c6788b3a79f413fb54710 /roles/calico/defaults/main.yaml | |
| parent | b99fa6451827088bf1a688dcad19f69de7fecbd1 (diff) | |
| parent | 0cb1bdb9b8debd0ef2ece17146ae87d6fb03f6c2 (diff) | |
| download | openshift-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/defaults/main.yaml')
| -rw-r--r-- | roles/calico/defaults/main.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/calico/defaults/main.yaml b/roles/calico/defaults/main.yaml index a16a7da71..03c612982 100644 --- a/roles/calico/defaults/main.yaml +++ b/roles/calico/defaults/main.yaml @@ -12,3 +12,9 @@ calico_etcd_key_file: "/etc/origin/calico/calico.etcd-client.key" calico_url_cni: "https://github.com/projectcalico/cni-plugin/releases/download/v1.5.5/calico" calico_url_ipam: "https://github.com/projectcalico/cni-plugin/releases/download/v1.5.5/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:v1.1.0" |