Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
18
Merge Requests
18
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
59e7e654
Commit
59e7e654
authored
Sep 22, 2022
by
Cédric Le Ninivin
Committed by
Cédric Le Ninivin
Mar 09, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud: Remove certificates from Software Instance JSON Object
parent
bea87b5c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
21 deletions
+0
-21
master/bt5/slapos_cloud/DocumentTemplateItem/portal_components/document.erp5.SoftwareInstance.py
...eItem/portal_components/document.erp5.SoftwareInstance.py
+0
-4
master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance.xml
...rtalTypeTemplateItem/portal_types/Software%20Instance.xml
+0
-17
No files found.
master/bt5/slapos_cloud/DocumentTemplateItem/portal_components/document.erp5.SoftwareInstance.py
View file @
59e7e654
...
@@ -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"
),
...
...
master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance.xml
View file @
59e7e654
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment