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/templates | |
| 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/templates')
| -rw-r--r-- | roles/calico/templates/calico.service.j2 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/roles/calico/templates/calico.service.j2 b/roles/calico/templates/calico.service.j2 index 7a1236392..719d7ba0d 100644 --- a/roles/calico/templates/calico.service.j2 +++ b/roles/calico/templates/calico.service.j2 @@ -10,7 +10,8 @@ ExecStart=/usr/bin/docker run --net=host --privileged \ --name=calico-node \ -e WAIT_FOR_DATASTORE=true \ -e FELIX_DEFAULTENDPOINTTOHOSTACTION=ACCEPT \ - -e CALICO_IPV4POOL_IPIP=always \ + -e CALICO_IPV4POOL_IPIP={{ calico_ipv4pool_ipip }} \ + -e CALICO_IPV4POOL_CIDR={{ calico_ipv4pool_cidr }} \ -e FELIX_IPV6SUPPORT=false \ -e ETCD_ENDPOINTS={{ etcd_endpoints }} \ -v /etc/origin/calico:/etc/origin/calico \ @@ -18,10 +19,11 @@ ExecStart=/usr/bin/docker run --net=host --privileged \ -e ETCD_CERT_FILE={{ calico_etcd_cert_file }} \ -e ETCD_KEY_FILE={{ calico_etcd_key_file }} \ -e NODENAME={{ openshift.common.hostname }} \ - -v /var/log/calico:/var/log/calico \ + -v {{ calico_log_dir }}:/var/log/calico\ -v /lib/modules:/lib/modules \ -v /var/run/calico:/var/run/calico \ - calico/node:v1.1.0 + {{ calico_node_image }} + ExecStop=-/usr/bin/docker stop calico-node |