Get rid of the global SSL switch

Change-Id: Ifb0beb8f6db7cc742e1bb2b38670dbc9c0dde3ee
This commit is contained in:
Proskurin Kirill 2017-02-14 11:07:21 +00:00
parent 177375e02c
commit 3eb74a9dbd
2 changed files with 3 additions and 3 deletions

View File

@ -15,7 +15,7 @@ service:
command: /opt/ccp/bin/entrypoint.sh
files:
- entrypoint
# {% if security.tls.enabled %}
# {% if etcd.tls.enabled %}
- server_certificate
- server_key
# {% endif %}
@ -25,7 +25,7 @@ files:
path: /opt/ccp/bin/entrypoint.sh
content: entrypoint.sh.j2
perm: "0755"
# {% if security.tls.enabled %}
# {% if etcd.tls.enabled %}
server_certificate:
path: /opt/ccp/etc/tls/etcd_server_certificate.pem
content: server.pem.j2

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
{% if security.tls.enabled and etcd.tls.enabled %}
{% if etcd.tls.enabled %}
etcd --listen-client-urls=https://{{ network_topology["private"]["address"] }}:{{ etcd.client_port.cont }},http://127.0.0.1:{{ etcd.client_port.cont }}\
--advertise-client-urls=https://{{ address("etcd", etcd.client_port, with_scheme=False) }}\
--peer-auto-tls\