X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=installers%2Fcharm%2Fkeystone%2Fsrc%2Fcharm.py;h=1dd0ba58f316143ba8558e0a62ef4a820ef1f0a9;hb=457fde18dad36d9d58c794918ca79e6d72539bc1;hp=669308037aa97119911d14e767d167af8b980383;hpb=da31d6e2625a67c6180080ec9433d0f8ebe1de64;p=osm%2Fdevops.git

diff --git a/installers/charm/keystone/src/charm.py b/installers/charm/keystone/src/charm.py
index 66930803..1dd0ba58 100755
--- a/installers/charm/keystone/src/charm.py
+++ b/installers/charm/keystone/src/charm.py
@@ -78,6 +78,7 @@ class ConfigModel(ModelValidator):
     token_expiration: int
     max_file_size: int
     site_url: Optional[str]
+    ingress_class: Optional[str]
     ingress_whitelist_source_range: Optional[str]
     tls_secret_name: Optional[str]
     mysql_host: Optional[str]
@@ -343,6 +344,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(
                     {
@@ -364,9 +370,10 @@ class KeystoneCharm(CharmedOsmBase):
                     str(config.max_file_size) + "m"
                     if config.max_file_size > 0
                     else config.max_file_size
-                ),
-                "kubernetes.io/ingress.class": "public",
+                )
             }
+            if config.ingress_class:
+                annotations["kubernetes.io/ingress.class"] = config.ingress_class
             ingress_resource_builder = IngressResourceV3Builder(
                 f"{self.app.name}-ingress", annotations
             )