Browse Source

Get rid of the global SSL switch

Change-Id: Ifb0beb8f6db7cc742e1bb2b38670dbc9c0dde3ee
changes/95/433595/1
Proskurin Kirill 2 years ago
parent
commit
3eb74a9dbd
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      service/etcd.yaml
  2. 1
    1
      service/files/entrypoint.sh.j2

+ 2
- 2
service/etcd.yaml View File

@@ -15,7 +15,7 @@ service:
15 15
         command: /opt/ccp/bin/entrypoint.sh
16 16
         files:
17 17
           - entrypoint
18
-      # {% if security.tls.enabled %}
18
+      # {% if etcd.tls.enabled %}
19 19
           - server_certificate
20 20
           - server_key
21 21
       # {% endif %}
@@ -25,7 +25,7 @@ files:
25 25
     path: /opt/ccp/bin/entrypoint.sh
26 26
     content: entrypoint.sh.j2
27 27
     perm: "0755"
28
-# {% if security.tls.enabled %}
28
+# {% if etcd.tls.enabled %}
29 29
   server_certificate:
30 30
     path: /opt/ccp/etc/tls/etcd_server_certificate.pem
31 31
     content: server.pem.j2

+ 1
- 1
service/files/entrypoint.sh.j2 View File

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

Loading…
Cancel
Save