diff options
| author | Dan Osborne <djosborne10@gmail.com> | 2017-05-19 14:49:52 -0700 |
|---|---|---|
| committer | Dan Osborne <djosborne10@gmail.com> | 2017-05-24 16:20:04 -0700 |
| commit | 854a77ce23135f0ef27c79338b48aa53e49d8202 (patch) | |
| tree | a4c296302c48002d384b298e43d5749480e821d0 /roles/calico_master | |
| parent | 8c57b7f62f6351d03c1e28d7cff88279fc16f88a (diff) | |
| download | openshift-854a77ce23135f0ef27c79338b48aa53e49d8202.tar.gz openshift-854a77ce23135f0ef27c79338b48aa53e49d8202.tar.bz2 openshift-854a77ce23135f0ef27c79338b48aa53e49d8202.tar.xz openshift-854a77ce23135f0ef27c79338b48aa53e49d8202.zip | |
Support byo etcd for calico
Diffstat (limited to 'roles/calico_master')
| -rw-r--r-- | roles/calico_master/templates/calico-policy-controller.yml.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/calico_master/templates/calico-policy-controller.yml.j2 b/roles/calico_master/templates/calico-policy-controller.yml.j2 index 3fb1abf0d..1b87758ce 100644 --- a/roles/calico_master/templates/calico-policy-controller.yml.j2 +++ b/roles/calico_master/templates/calico-policy-controller.yml.j2 @@ -78,7 +78,7 @@ spec: env: # The location of the Calico etcd cluster. - name: ETCD_ENDPOINTS - value: {{ etcd_endpoints }} + value: {{ calico_etcd_endpoints }} # Location of the CA certificate for etcd. - name: ETCD_CA_CERT_FILE value: {{ calico_etcd_ca_cert_file }} @@ -96,10 +96,10 @@ spec: volumeMounts: # Mount in the etcd TLS secrets. - name: certs - mountPath: /etc/origin/calico + mountPath: {{ calico_etcd_cert_dir }} volumes: # Mount in the etcd TLS secrets. - name: certs hostPath: - path: /etc/origin/calico + path: {{ calico_etcd_cert_dir }} |