X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fkeystone%2Fsrc%2Fcharm.py;h=8300b88d31654cba1184bd3cfc80f4849643fb7f;hb=8f0f66f4bcf6340f706f0ca019d00ac16c21c32b;hp=b5ce0cc6ead7728bec789c69d94d027c55f846ed;hpb=996a5604c7d31f3758503b08a426f1f40619b17b;p=osm%2Fdevops.git diff --git a/installers/charm/keystone/src/charm.py b/installers/charm/keystone/src/charm.py index b5ce0cc6..8300b88d 100755 --- 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( { @@ -365,6 +370,7 @@ class KeystoneCharm(CharmedOsmBase): if config.max_file_size > 0 else config.max_file_size ), + "kubernetes.io/ingress.class": "public", } ingress_resource_builder = IngressResourceV3Builder( f"{self.app.name}-ingress", annotations