projects
/
osm
/
devops.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7920102
)
Fix bug 1571 - Keystone charm needs to pass CA SSL certificate
22/11022/2
author
sousaedu
<eduardo.sousa@canonical.com>
Thu, 17 Jun 2021 11:43:59 +0000
(12:43 +0100)
committer
beierlm
<mark.beierl@canonical.com>
Fri, 18 Jun 2021 02:10:46 +0000
(
04:10
+0200)
Change-Id: I7bce4fc0f4bc0d96b2bc7b84eff9eef655e8b098
Signed-off-by: sousaedu <eduardo.sousa@canonical.com>
installers/charm/keystone/src/charm.py
patch
|
blob
|
history
diff --git
a/installers/charm/keystone/src/charm.py
b/installers/charm/keystone/src/charm.py
index
6693080
..
8300b88
100755
(executable)
--- a/
installers/charm/keystone/src/charm.py
+++ b/
installers/charm/keystone/src/charm.py
@@
-343,6
+343,11
@@
class KeystoneCharm(CharmedOsmBase):
{"LDAP_GROUP_TREE_DN": config_ldap.ldap_group_tree_dn}
)
+ if config_ldap.ldap_tls_cacert_base64:
+ container_builder.add_envs(
+ {"LDAP_TLS_CACERT_BASE64": config_ldap.ldap_tls_cacert_base64}
+ )
+
if config_ldap.ldap_use_starttls:
container_builder.add_envs(
{