Merge pull request #594 from adidenko/fix-calico-policy-controller

Fix policy controller
2016-11-10 16:15:36 +01:00 · 2016-11-10 16:15:36 +01:00 · 5821f9748a
parent 046e315bfd 251800eb16
commit 5821f9748a
2 changed files with 12 additions and 10 deletions
--- a/roles/kubernetes-apps/ansible/defaults/main.yml
+++ b/roles/kubernetes-apps/ansible/defaults/main.yml
@ -10,3 +10,6 @@ kubednsmasq_image_repo: "gcr.io/google_containers/kube-dnsmasq-amd64"
 kubednsmasq_image_tag: "{{ kubednsmasq_version }}"
 exechealthz_image_repo: "gcr.io/google_containers/exechealthz-amd64"
 exechealthz_image_tag: "{{ exechealthz_version }}"
+
+# SSL
+etcd_cert_dir: "/etc/ssl/etcd/ssl"
--- a/roles/kubernetes-apps/ansible/templates/calico-policy-controller.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/calico-policy-controller.yml.j2
@ -52,4 +52,3 @@ spec:
      - hostPath:
          path: {{ etcd_cert_dir }}
        name: etcd-certs
-