summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorProskurin Kirill <kproskurin@mirantis.com>2017-02-14 11:07:21 +0000
committerProskurin Kirill <kproskurin@mirantis.com>2017-02-14 11:07:46 +0000
commit3eb74a9dbd0b8456a280bbea82ee06b617fd962c (patch)
tree0f62bbe457026fbd9ce0af0085b9c73fadff11a1
parent177375e02cdf81b7e61957b75f2e97748e10259a (diff)
Get rid of the global SSL switch
Notes
Notes (review): Code-Review+1: Sergey Kraynev <skraynev@mirantis.com> Code-Review+2: Sergey Reshetnyak <sreshetniak@mirantis.com> Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@mirantis.com> Code-Review+2: Artur Zarzycki <azarzycki@mirantis.com> Workflow+1: Artur Zarzycki <azarzycki@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 14 Feb 2017 13:20:21 +0000 Reviewed-on: https://review.openstack.org/433595 Project: openstack/fuel-ccp-etcd Branch: refs/heads/master
-rw-r--r--service/etcd.yaml4
-rw-r--r--service/files/entrypoint.sh.j22
2 files changed, 3 insertions, 3 deletions
diff --git a/service/etcd.yaml b/service/etcd.yaml
index a9c6a47..c46d998 100644
--- a/service/etcd.yaml
+++ b/service/etcd.yaml
@@ -15,7 +15,7 @@ service:
15 command: /opt/ccp/bin/entrypoint.sh 15 command: /opt/ccp/bin/entrypoint.sh
16 files: 16 files:
17 - entrypoint 17 - entrypoint
18 # {% if security.tls.enabled %} 18 # {% if etcd.tls.enabled %}
19 - server_certificate 19 - server_certificate
20 - server_key 20 - server_key
21 # {% endif %} 21 # {% endif %}
@@ -25,7 +25,7 @@ files:
25 path: /opt/ccp/bin/entrypoint.sh 25 path: /opt/ccp/bin/entrypoint.sh
26 content: entrypoint.sh.j2 26 content: entrypoint.sh.j2
27 perm: "0755" 27 perm: "0755"
28# {% if security.tls.enabled %} 28# {% if etcd.tls.enabled %}
29 server_certificate: 29 server_certificate:
30 path: /opt/ccp/etc/tls/etcd_server_certificate.pem 30 path: /opt/ccp/etc/tls/etcd_server_certificate.pem
31 content: server.pem.j2 31 content: server.pem.j2
diff --git a/service/files/entrypoint.sh.j2 b/service/files/entrypoint.sh.j2
index e11bfec..75d4c3d 100644
--- a/service/files/entrypoint.sh.j2
+++ b/service/files/entrypoint.sh.j2
@@ -1,6 +1,6 @@
1#!/usr/bin/env bash 1#!/usr/bin/env bash
2 2
3{% if security.tls.enabled and etcd.tls.enabled %} 3{% if etcd.tls.enabled %}
4etcd --listen-client-urls=https://{{ network_topology["private"]["address"] }}:{{ etcd.client_port.cont }},http://127.0.0.1:{{ etcd.client_port.cont }}\ 4etcd --listen-client-urls=https://{{ network_topology["private"]["address"] }}:{{ etcd.client_port.cont }},http://127.0.0.1:{{ etcd.client_port.cont }}\
5 --advertise-client-urls=https://{{ address("etcd", etcd.client_port, with_scheme=False) }}\ 5 --advertise-client-urls=https://{{ address("etcd", etcd.client_port, with_scheme=False) }}\
6 --peer-auto-tls\ 6 --peer-auto-tls\