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_master | |
| 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_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 }} |