From 331f141f635ccc1bd6261d89db3b47828fd41811 Mon Sep 17 00:00:00 2001
From: Dmitri Rubinstein <dmitri.rubinstein@googlemail.com>
Date: Tue, 30 Jan 2018 14:26:58 +0100
Subject: [PATCH] Fix DNS entries in etcd's openssl.conf by adding a newline.
(#2208)
DNS entries generated from 'etcd_cert_alt_names' variable in etcd's
openssl.conf are not terminated by a newline.
This fixes issue #2207.
---
roles/etcd/templates/openssl.conf.j2 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/etcd/templates/openssl.conf.j2 b/roles/etcd/templates/openssl.conf.j2
index f5970af81..48327f0bf 100644
--- a/roles/etcd/templates/openssl.conf.j2
+++ b/roles/etcd/templates/openssl.conf.j2
@@ -32,9 +32,9 @@ DNS.{{ 1 + loop.index }} = {{ host }}
DNS.{{ idx | string }} = {{ apiserver_loadbalancer_domain_name }}
{% endif %}
{% set idx = groups['etcd'] | length | int + 3 %}
-{%- for etcd_alt_name in etcd_cert_alt_names -%}
+{% for etcd_alt_name in etcd_cert_alt_names %}
DNS.{{ idx + 1 + loop.index }} = {{ etcd_alt_name }}
-{%- endfor -%}
+{% endfor %}
{% for host in groups['etcd'] %}
IP.{{ 2 * loop.index - 1 }} = {{ hostvars[host]['access_ip'] | default(hostvars[host]['ansible_default_ipv4']['address']) }}
IP.{{ 2 * loop.index }} = {{ hostvars[host]['ip'] | default(hostvars[host]['ansible_default_ipv4']['address']) }}
--
GitLab