From 59e7e65435a2677a87c329baa448cbc82873cf0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Le=20Ninivin?= <cedric.leninivin@nexedi.com> Date: Thu, 22 Sep 2022 09:46:01 +0000 Subject: [PATCH] slapos_cloud: Remove certificates from Software Instance JSON Object --- .../document.erp5.SoftwareInstance.py | 4 ---- .../portal_types/Software%20Instance.xml | 17 ----------------- 2 files changed, 21 deletions(-) diff --git a/master/bt5/slapos_cloud/DocumentTemplateItem/portal_components/document.erp5.SoftwareInstance.py b/master/bt5/slapos_cloud/DocumentTemplateItem/portal_components/document.erp5.SoftwareInstance.py index bd59a7f5c..6ac5ee7c3 100644 --- a/master/bt5/slapos_cloud/DocumentTemplateItem/portal_components/document.erp5.SoftwareInstance.py +++ b/master/bt5/slapos_cloud/DocumentTemplateItem/portal_components/document.erp5.SoftwareInstance.py @@ -342,10 +342,6 @@ class SoftwareInstance(Item, JSONType): "root_instance_title": parameter_dict.get("root_instance_title"), "ip_list": parameter_dict.get("ip_list"), "full_ip_list": parameter_dict.get("full_ip_list"), - "X509": { - "key": self.getSslKey(), - "certificate": self.getSslCertificate(), - }, "sla_parameters": self.getSlaXmlAsDict(), "compute_node_id": parameter_dict.get("slap_computer_id"), "compute_partition_id": parameter_dict.get("slap_computer_partition_id"), diff --git a/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance.xml b/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance.xml index c4f362533..05de9502c 100644 --- a/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance.xml +++ b/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance.xml @@ -143,23 +143,6 @@ }\n }\n },\n - "X509": {\n - "title": "X509 Certificates",\n - "description": "X509 Certificates used by the instance to authentify itself on master",\n - "type": "object",\n - "properties": {\n - "key": {\n - "title": "X509 Key",\n - "type": "string",\n - "descritpion": "X509 Key used by the instance to authentify itself on master"\n - },\n - "certificate": {\n - "title": "X509 Certificate",\n - "type": "string",\n - "descritpion": "X509 Certificate used by the instance to authentify itself on master"\n - }\n - }\n - },\n "sla_parameters": {\n "title": "Target Node Selection Parameters",\n "type": "object",\n -- 2.30.9