From c24c7e42f3cce9863527f4f53a1203472573b2a0 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Fri, 18 May 2018 13:44:16 -0500
Subject: [PATCH] Ldap: Drive scheme via endpoints section

This PS updates the ldap scheme used to be driven by the endpoints
section.

Change-Id: I87e12d12f9d0806174a94b5b6dacb6360f4e2410
---
 ldap/templates/bin/_bootstrap.sh.tpl | 2 +-
 ldap/values.yaml                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ldap/templates/bin/_bootstrap.sh.tpl b/ldap/templates/bin/_bootstrap.sh.tpl
index 3e65185a0..c29b8e7af 100644
--- a/ldap/templates/bin/_bootstrap.sh.tpl
+++ b/ldap/templates/bin/_bootstrap.sh.tpl
@@ -3,6 +3,6 @@ set -xe
 
 {{- $url := tuple "ldap" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}
 {{- $port := tuple "ldap" "internal" "ldap" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-LDAPHOST="ldap://{{ $url }}:{{ $port }}"
+LDAPHOST="{{ .Values.endpoints.ldap.scheme }}://{{ $url }}:{{ $port }}"
 ADMIN="cn={{ .Values.secrets.identity.admin }},{{ tuple .Values.openldap.domain . | include "splitdomain" }}"
 ldapadd -x -D $ADMIN -H $LDAPHOST -w {{ .Values.openldap.password }} -f /etc/sample_data.ldif
diff --git a/ldap/values.yaml b/ldap/values.yaml
index 42b4fdd9d..72a97b44e 100644
--- a/ldap/values.yaml
+++ b/ldap/values.yaml
@@ -142,7 +142,7 @@ endpoints:
     host_fqdn_override:
       default: null
     path: null
-    scheme: 'http'
+    scheme: 'ldap'
     port:
       ldap:
         default: 389