From 89ade65ad63e151cdc10aa7cbd4adfbff6298aca Mon Sep 17 00:00:00 2001
From: Brad Beam <bradbeam@users.noreply.github.com>
Date: Tue, 27 Feb 2018 08:34:07 -0600
Subject: [PATCH] Fixing etcd certs for calico rr (#2374)
---
roles/network_plugin/calico/rr/tasks/main.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/network_plugin/calico/rr/tasks/main.yml b/roles/network_plugin/calico/rr/tasks/main.yml
index 5b893f38e..491065360 100644
--- a/roles/network_plugin/calico/rr/tasks/main.yml
+++ b/roles/network_plugin/calico/rr/tasks/main.yml
@@ -48,7 +48,10 @@
- name: Calico-rr | Configure route reflector
command: |-
- {{ bin_dir }}/etcdctl --peers={{ etcd_access_addresses }} \
+ {{ bin_dir }}/etcdctl \
+ --peers={{ etcd_access_addresses }} \
+ --cert-file {{ etcd_cert_dir }}/node-{{ groups['etcd'][0] }}.pem \
+ --key-file {{ etcd_cert_dir }}/node-{{ groups['etcd'][0] }}-key.pem \
set /calico/bgp/v1/rr_v4/{{ rr_ip }} \
'{
"ip": "{{ rr_ip }}",
@@ -57,9 +60,6 @@
retries: 4
delay: "{{ retry_stagger | random + 3 }}"
delegate_to: "{{groups['etcd'][0]}}"
- environment:
- ETCDCTL_CERT: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem"
- ETCDCTL_KEY: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem"
- meta: flush_handlers
--
GitLab