openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Ldap: Drive scheme via endpoints section"

Browse Source
This commit is contained in:
Zuul 2018-05-19 18:01:27 +00:00 committed by Gerrit Code Review
commit 1dfdb3594f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ldap/templates/bin/_bootstrap.sh.tpl
View File

@ -3,6 +3,6 @@ set -xe
{{- $url := tuple "ldap" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }} {{- $url := tuple "ldap" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}
{{- $port := tuple "ldap" "internal" "ldap" . | include "helm-toolkit.endpoints.endpoint_port_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" }}" 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 ldapadd -x -D $ADMIN -H $LDAPHOST -w {{ .Values.openldap.password }} -f /etc/sample_data.ldif

2
ldap/values.yaml
View File

@ -142,7 +142,7 @@ endpoints:
host_fqdn_override: host_fqdn_override:
default: null default: null
path: null path: null
scheme: 'http' scheme: 'ldap'
port: port:
ldap: ldap:
default: 389 default: 389