From 854a77ce23135f0ef27c79338b48aa53e49d8202 Mon Sep 17 00:00:00 2001
From: Dan Osborne <djosborne10@gmail.com>
Date: Fri, 19 May 2017 14:49:52 -0700
Subject: Support byo etcd for calico

---
 roles/calico_master/templates/calico-policy-controller.yml.j2 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'roles/calico_master')

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 }}
-- 
cgit v1.2.3