summaryrefslogtreecommitdiffstats
path: root/roles/calico/templates/calico.service.j2
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-17 14:49:21 -0400
committerGitHub <noreply@github.com>2017-08-17 14:49:21 -0400
commitcf1aa0e3bc4bc207a0da718695326b6850b90610 (patch)
tree3ac2b389a1c39255f806de8c0ac2dd2254b70ffb /roles/calico/templates/calico.service.j2
parent1827ab832d47abcedeceafb9098fbcfaa19b4bd5 (diff)
parent7a57517cf59ff77f19f8c58f44f2880f151e95b2 (diff)
downloadopenshift-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/templates/calico.service.j2')
-rw-r--r--roles/calico/templates/calico.service.j23
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/calico/templates/calico.service.j2 b/roles/calico/templates/calico.service.j2
index 302c5f34e..7653e19b1 100644
--- a/roles/calico/templates/calico.service.j2
+++ b/roles/calico/templates/calico.service.j2
@@ -11,13 +11,14 @@ ExecStart=/usr/bin/docker run --net=host --privileged \
-e WAIT_FOR_DATASTORE=true \
-e FELIX_DEFAULTENDPOINTTOHOSTACTION=ACCEPT \
-e CALICO_IPV4POOL_IPIP={{ calico_ipv4pool_ipip }} \
- -e CALICO_IPV4POOL_CIDR={{ calico_ipv4pool_cidr }} \
+ -e CALICO_IPV4POOL_CIDR={{ openshift.master.sdn_cluster_network_cidr }} \
-e FELIX_IPV6SUPPORT=false \
-e ETCD_ENDPOINTS={{ calico_etcd_endpoints }} \
-v {{ calico_etcd_cert_dir }}:{{ calico_etcd_cert_dir }} \
-e ETCD_CA_CERT_FILE={{ calico_etcd_ca_cert_file }} \
-e ETCD_CERT_FILE={{ calico_etcd_cert_file }} \
-e ETCD_KEY_FILE={{ calico_etcd_key_file }} \
+ -e CLUSTER_TYPE=origin,bgp \
-e NODENAME={{ openshift.common.hostname }} \
-v {{ calico_log_dir }}:/var/log/calico\
-v /lib/modules:/lib/modules \