From 31659efe13db773718fb1f08a697f36b4be830f9 Mon Sep 17 00:00:00 2001
From: Brad Beam <bradbeam@users.noreply.github.com>
Date: Thu, 22 Feb 2018 08:37:07 -0600
Subject: [PATCH] Fixing cert name in calico/canal for etcd check (#2358)
---
roles/network_plugin/calico/tasks/main.yml | 4 ++--
roles/network_plugin/canal/tasks/main.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/network_plugin/calico/tasks/main.yml b/roles/network_plugin/calico/tasks/main.yml
index b3cacaec4..f3072d388 100644
--- a/roles/network_plugin/calico/tasks/main.yml
+++ b/roles/network_plugin/calico/tasks/main.yml
@@ -83,8 +83,8 @@
uri:
url: https://localhost:2379/health
validate_certs: no
- client_cert: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem"
- client_key: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem"
+ client_cert: "{{ etcd_cert_dir }}/node-{{ groups['etcd'][0] }}.pem"
+ client_key: "{{ etcd_cert_dir }}/node-{{ groups['etcd'][0] }}-key.pem"
register: result
until: result.status == 200 or result.status == 401
retries: 10
diff --git a/roles/network_plugin/canal/tasks/main.yml b/roles/network_plugin/canal/tasks/main.yml
index 7eeb93919..d42f4ec56 100644
--- a/roles/network_plugin/canal/tasks/main.yml
+++ b/roles/network_plugin/canal/tasks/main.yml
@@ -35,8 +35,8 @@
changed_when: false
run_once: true
environment:
- ETCDCTL_CERT_FILE: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem"
- ETCDCTL_KEY_FILE: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem"
+ ETCDCTL_CERT_FILE: "{{ etcd_cert_dir }}/node-{{ groups['etcd'][0] }}.pem"
+ ETCDCTL_KEY_FILE: "{{ etcd_cert_dir }}/node-{{ groups['etcd'][0] }}-key.pem"
- name: Canal | Create canal node manifests
template:
--
GitLab