Browse Source

Fix ETCD_CIPHER_SUITES shell var assignment (#7002)

pull/6966/head
emiran-orange 4 years ago
committed by GitHub
parent
commit
7084d38767
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
  1. 2
      roles/etcd/templates/etcd-events.env.j2
  2. 2
      roles/etcd/templates/etcd.env.j2

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

@ -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

@ -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() %}

Loading…
Cancel
Save