X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fkeystone%2Fsrc%2Fcharm.py;h=446d2e0ce5e4e0d9983d80b0161fcae432589019;hb=refs%2Fchanges%2F54%2F13154%2F5;hp=4560ff52db3693093d7438a367e201b0c109d151;hpb=540d93716ee0a4c4ffd070120779c1c40f6f353c;p=osm%2Fdevops.git diff --git a/installers/charm/keystone/src/charm.py b/installers/charm/keystone/src/charm.py index 4560ff52..446d2e0c 100755 --- a/installers/charm/keystone/src/charm.py +++ b/installers/charm/keystone/src/charm.py @@ -248,9 +248,9 @@ class KeystoneCharm(CharmedOsmBase): ): credentials_files_builder = FilesV3Builder() fernet_files_builder = FilesV3Builder() - for (key_id, _) in enumerate(credential_keys): + for key_id, _ in enumerate(credential_keys): credentials_files_builder.add_file(str(key_id), str(key_id), secret=True) - for (key_id, _) in enumerate(fernet_keys): + for key_id, _ in enumerate(fernet_keys): fernet_files_builder.add_file(str(key_id), str(key_id), secret=True) return credentials_files_builder.build(), fernet_files_builder.build() @@ -372,14 +372,14 @@ class KeystoneCharm(CharmedOsmBase): ldap_secrets = { "authentication_domain_name": config_ldap.ldap_authentication_domain_name, "url": config_ldap.ldap_url, - "page_size": config_ldap.ldap_page_size, + "page_size": str(config_ldap.ldap_page_size), "user_objectclass": config_ldap.ldap_user_objectclass, "user_id_attribute": config_ldap.ldap_user_id_attribute, "user_name_attribute": config_ldap.ldap_user_name_attribute, "user_pass_attribute": config_ldap.ldap_user_pass_attribute, - "user_enabled_mask": config_ldap.ldap_user_enabled_mask, + "user_enabled_mask": str(config_ldap.ldap_user_enabled_mask), "user_enabled_default": config_ldap.ldap_user_enabled_default, - "user_enabled_invert": config_ldap.ldap_user_enabled_invert, + "user_enabled_invert": str(config_ldap.ldap_user_enabled_invert), "group_objectclass": config_ldap.ldap_group_objectclass, } ldap_envs = { @@ -429,7 +429,7 @@ class KeystoneCharm(CharmedOsmBase): ldap_envs["LDAP_TLS_CACERT_BASE64"] = "tls_cacert_base64" if config_ldap.ldap_use_starttls: - ldap_secrets["use_starttls"] = config_ldap.ldap_use_starttls + ldap_secrets["use_starttls"] = str(config_ldap.ldap_use_starttls) ldap_secrets["tls_cacert_base64"] = config_ldap.ldap_tls_cacert_base64 ldap_secrets["tls_req_cert"] = config_ldap.ldap_tls_req_cert ldap_envs["LDAP_USE_STARTTLS"] = "use_starttls"