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

Fix ETCD_CIPHER_SUITES shell var assignment (#7002)

Browse source
This commit is contained in:
emiran-orange 2020-12-08 22:23:34 +01:00 committed by GitHub
parent 00e0f3bd2b
commit 7084d38767
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/etcd/templates/etcd-events.env.j2
View file

@ -32,7 +32,7 @@ ETCD_PEER_KEY_FILE={{ etcd_cert_dir }}/member-{{ inventory_hostname }}-key.pem
ETCD_PEER_CLIENT_CERT_AUTH={{ etcd_peer_client_auth }} ETCD_PEER_CLIENT_CERT_AUTH={{ etcd_peer_client_auth }}
{% if etcd_tls_cipher_suites is defined %} {% if etcd_tls_cipher_suites is defined %}
ETCD_CIPHER_SUITES: {% for tls in etcd_tls_cipher_suites %}{{ tls }}{{ "," if not loop.last else "" }}{% endfor %} ETCD_CIPHER_SUITES={% for tls in etcd_tls_cipher_suites %}{{ tls }}{{ "," if not loop.last else "" }}{% endfor %}
{% endif %} {% endif %}
{% for key, value in etcd_extra_vars.items() %} {% for key, value in etcd_extra_vars.items() %}

2
roles/etcd/templates/etcd.env.j2
View file

@ -41,7 +41,7 @@ ETCD_PEER_KEY_FILE={{ etcd_cert_dir }}/member-{{ inventory_hostname }}-key.pem
ETCD_PEER_CLIENT_CERT_AUTH={{ etcd_peer_client_auth }} ETCD_PEER_CLIENT_CERT_AUTH={{ etcd_peer_client_auth }}
{% if etcd_tls_cipher_suites is defined %} {% if etcd_tls_cipher_suites is defined %}
ETCD_CIPHER_SUITES: {% for tls in etcd_tls_cipher_suites %}{{ tls }}{{ "," if not loop.last else "" }}{% endfor %} ETCD_CIPHER_SUITES={% for tls in etcd_tls_cipher_suites %}{{ tls }}{{ "," if not loop.last else "" }}{% endfor %}
{% endif %} {% endif %}
{% for key, value in etcd_extra_vars.items() %} {% for key, value in etcd_extra_vars.items() %}