diff options
| author | Dan Osborne <djosborne10@gmail.com> | 2017-08-16 13:07:41 -0700 |
|---|---|---|
| committer | Dan Osborne <djosborne10@gmail.com> | 2017-08-17 10:28:58 -0700 |
| commit | 7a57517cf59ff77f19f8c58f44f2880f151e95b2 (patch) | |
| tree | 92aa58ee541804e3e83ff810f04dd832c3d5d0f3 /roles/calico/templates | |
| parent | b89fb4e03d4fba2c0616879a1dc72a4d45f42176 (diff) | |
| download | openshift-7a57517cf59ff77f19f8c58f44f2880f151e95b2.tar.gz openshift-7a57517cf59ff77f19f8c58f44f2880f151e95b2.tar.bz2 openshift-7a57517cf59ff77f19f8c58f44f2880f151e95b2.tar.xz openshift-7a57517cf59ff77f19f8c58f44f2880f151e95b2.zip | |
Use sdn_cluster_network_cidr as default calico pool
Diffstat (limited to 'roles/calico/templates')
| -rw-r--r-- | roles/calico/templates/calico.service.j2 | 3 |
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 \ |