C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2295 from manics/supplementary-bugfix

Browse source 
Fix indexing of supplementary DNS in openssl.conf
This commit is contained in:
Aivars Sterns 2018-03-12 10:54:56 +02:00 committed by GitHub
commit 436de45dd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
roles/kubernetes/secrets/templates/openssl.conf.j2
View file

@ -15,9 +15,10 @@ DNS.5 = localhost
{% for host in groups['kube-master'] %} {% for host in groups['kube-master'] %}
DNS.{{ 5 + loop.index }} = {{ host }} DNS.{{ 5 + loop.index }} = {{ host }}
{% endfor %} {% endfor %}
{% set idns = groups['kube-master'] | length | int + 5 %}
{% if loadbalancer_apiserver is defined %} {% if loadbalancer_apiserver is defined %}
{% set idx = groups['kube-master'] | length | int + 5 + 1 %} {% set idns = idns + 1 %}
DNS.{{ idx | string }} = {{ apiserver_loadbalancer_domain_name }} DNS.{{ idns | string }} = {{ apiserver_loadbalancer_domain_name }}
{% endif %} {% endif %}
{% for host in groups['kube-master'] %} {% for host in groups['kube-master'] %}
IP.{{ 2 * loop.index - 1 }} = {{ hostvars[host]['access_ip'] | default(hostvars[host]['ansible_default_ipv4']['address']) }} IP.{{ 2 * loop.index - 1 }} = {{ hostvars[host]['access_ip'] | default(hostvars[host]['ansible_default_ipv4']['address']) }}
@ -36,7 +37,7 @@ IP.{{ idx + 1 }} = 127.0.0.1
{% if addr | ipaddr %} {% if addr | ipaddr %}
IP.{{ is + loop.index }} = {{ addr }} IP.{{ is + loop.index }} = {{ addr }}
{% else %} {% else %}
DNS.{{ is + loop.index }} = {{ addr }} DNS.{{ idns + loop.index }} = {{ addr }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}