diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-05 16:56:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 16:56:05 -0400 |
| commit | 8fe2c75baeb8b83f7b2df738a6efbc2adae38428 (patch) | |
| tree | a62d4d4e20422574a0cb202d499e5aee842654b5 /roles/calico/templates | |
| parent | 6df334d749921eb03f141bbafcc88e1eb95e8578 (diff) | |
| parent | 854a77ce23135f0ef27c79338b48aa53e49d8202 (diff) | |
| download | openshift-8fe2c75baeb8b83f7b2df738a6efbc2adae38428.tar.gz openshift-8fe2c75baeb8b83f7b2df738a6efbc2adae38428.tar.bz2 openshift-8fe2c75baeb8b83f7b2df738a6efbc2adae38428.tar.xz openshift-8fe2c75baeb8b83f7b2df738a6efbc2adae38428.zip | |
Merge pull request #4267 from ozdanborne/byo-etcd
Merged by openshift-bot
Diffstat (limited to 'roles/calico/templates')
| -rw-r--r-- | roles/calico/templates/10-calico.conf.j2 | 2 | ||||
| -rw-r--r-- | roles/calico/templates/calico.service.j2 | 4 | ||||
| -rw-r--r-- | roles/calico/templates/calicoctl.cfg.j2 | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/roles/calico/templates/10-calico.conf.j2 b/roles/calico/templates/10-calico.conf.j2 index 3c8c6b046..1ec569cff 100644 --- a/roles/calico/templates/10-calico.conf.j2 +++ b/roles/calico/templates/10-calico.conf.j2 @@ -4,7 +4,7 @@ "ipam": { "type": "calico-ipam" }, - "etcd_endpoints": "{{ etcd_endpoints }}", + "etcd_endpoints": "{{ calico_etcd_endpoints }}", "etcd_key_file": "{{ calico_etcd_key_file }}", "etcd_cert_file": "{{ calico_etcd_cert_file }}", "etcd_ca_cert_file": "{{ calico_etcd_ca_cert_file }}", diff --git a/roles/calico/templates/calico.service.j2 b/roles/calico/templates/calico.service.j2 index 719d7ba0d..302c5f34e 100644 --- a/roles/calico/templates/calico.service.j2 +++ b/roles/calico/templates/calico.service.j2 @@ -13,8 +13,8 @@ ExecStart=/usr/bin/docker run --net=host --privileged \ -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 \ + -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 }} \ diff --git a/roles/calico/templates/calicoctl.cfg.j2 b/roles/calico/templates/calicoctl.cfg.j2 index 722385ed8..a00ea27dc 100644 --- a/roles/calico/templates/calicoctl.cfg.j2 +++ b/roles/calico/templates/calicoctl.cfg.j2 @@ -3,7 +3,7 @@ kind: calicoApiConfig metadata: spec: datastoreType: "etcdv2" - etcdEndpoints: "{{ etcd_endpoints }}" + etcdEndpoints: "{{ calico_etcd_endpoints }}" etcdKeyFile: "{{ calico_etcd_key_file }}" etcdCertFile: "{{ calico_etcd_cert_file }}" etcdCaCertFile: "{{ calico_etcd_ca_cert_file }}" |