Commit 59e7e654 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin Committed by Cédric Le Ninivin

slapos_cloud: Remove certificates from Software Instance JSON Object

parent bea87b5c
...@@ -342,10 +342,6 @@ class SoftwareInstance(Item, JSONType): ...@@ -342,10 +342,6 @@ class SoftwareInstance(Item, JSONType):
"root_instance_title": parameter_dict.get("root_instance_title"), "root_instance_title": parameter_dict.get("root_instance_title"),
"ip_list": parameter_dict.get("ip_list"), "ip_list": parameter_dict.get("ip_list"),
"full_ip_list": parameter_dict.get("full_ip_list"), "full_ip_list": parameter_dict.get("full_ip_list"),
"X509": {
"key": self.getSslKey(),
"certificate": self.getSslCertificate(),
},
"sla_parameters": self.getSlaXmlAsDict(), "sla_parameters": self.getSlaXmlAsDict(),
"compute_node_id": parameter_dict.get("slap_computer_id"), "compute_node_id": parameter_dict.get("slap_computer_id"),
"compute_partition_id": parameter_dict.get("slap_computer_partition_id"), "compute_partition_id": parameter_dict.get("slap_computer_partition_id"),
......
...@@ -143,23 +143,6 @@ ...@@ -143,23 +143,6 @@
}\n }\n
}\n }\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 "sla_parameters": {\n
"title": "Target Node Selection Parameters",\n "title": "Target Node Selection Parameters",\n
"type": "object",\n "type": "object",\n
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment