projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding extra LDAP configuration options to Keystone charm
[osm/devops.git]
/
installers
/
charm
/
keystone
/
src
/
charm.py
diff --git
a/installers/charm/keystone/src/charm.py
b/installers/charm/keystone/src/charm.py
index
23dfcb6
..
ef16690
100755
(executable)
--- a/
installers/charm/keystone/src/charm.py
+++ b/
installers/charm/keystone/src/charm.py
@@
-206,6
+206,7
@@
class KeystoneCharm(CharmBase):
"ldap_authentication_domain_name"
]
envconfig["LDAP_URL"] = config["ldap_url"]
"ldap_authentication_domain_name"
]
envconfig["LDAP_URL"] = config["ldap_url"]
+ envconfig["LDAP_PAGE_SIZE"] = config["ldap_page_size"]
envconfig["LDAP_USER_OBJECTCLASS"] = config["ldap_user_objectclass"]
envconfig["LDAP_USER_ID_ATTRIBUTE"] = config["ldap_user_id_attribute"]
envconfig["LDAP_USER_NAME_ATTRIBUTE"] = config["ldap_user_name_attribute"]
envconfig["LDAP_USER_OBJECTCLASS"] = config["ldap_user_objectclass"]
envconfig["LDAP_USER_ID_ATTRIBUTE"] = config["ldap_user_id_attribute"]
envconfig["LDAP_USER_NAME_ATTRIBUTE"] = config["ldap_user_name_attribute"]
@@
-213,6
+214,7
@@
class KeystoneCharm(CharmBase):
envconfig["LDAP_USER_ENABLED_MASK"] = config["ldap_user_enabled_mask"]
envconfig["LDAP_USER_ENABLED_DEFAULT"] = config["ldap_user_enabled_default"]
envconfig["LDAP_USER_ENABLED_INVERT"] = config["ldap_user_enabled_invert"]
envconfig["LDAP_USER_ENABLED_MASK"] = config["ldap_user_enabled_mask"]
envconfig["LDAP_USER_ENABLED_DEFAULT"] = config["ldap_user_enabled_default"]
envconfig["LDAP_USER_ENABLED_INVERT"] = config["ldap_user_enabled_invert"]
+ envconfig["LDAP_GROUP_OBJECTCLASS"] = config["ldap_group_objectclass"]
if config["ldap_bind_user"]:
envconfig["LDAP_BIND_USER"] = config["ldap_bind_user"]
if config["ldap_bind_user"]:
envconfig["LDAP_BIND_USER"] = config["ldap_bind_user"]
@@
-231,6
+233,12
@@
class KeystoneCharm(CharmBase):
"ldap_user_enabled_attribute"
]
"ldap_user_enabled_attribute"
]
+ if config["ldap_chase_referrals"]:
+ envconfig["LDAP_CHASE_REFERRALS"] = config["ldap_chase_referrals"]
+
+ if config["ldap_group_tree_dn"]:
+ envconfig["LDAP_GROUP_TREE_DN"] = config["ldap_group_tree_dn"]
+
if config["ldap_use_starttls"]:
envconfig["LDAP_USE_STARTTLS"] = config["ldap_use_starttls"]
envconfig["LDAP_TLS_CACERT_BASE64"] = config["ldap_tls_cacert_base64"]
if config["ldap_use_starttls"]:
envconfig["LDAP_USE_STARTTLS"] = config["ldap_use_starttls"]
envconfig["LDAP_TLS_CACERT_BASE64"] = config["ldap_tls_cacert_base64"]