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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Cédric Le Ninivin
slapos.core
Commits
7c712feb
Commit
7c712feb
authored
Nov 07, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not generate certificate for slave instance.
parent
241c3ee1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
16 deletions
+13
-16
master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/SlaveInstanceConstraint/property_existence_constraint.xml
...SlaveInstanceConstraint/property_existence_constraint.xml
+0
-1
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCoreConstraint.py
...slapos_cloud/TestTemplateItem/testSlapOSCoreConstraint.py
+0
-6
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/instance_slap_interface_workflow/scripts/RequesterInstance_request.xml
..._interface_workflow/scripts/RequesterInstance_request.xml
+12
-8
master/bt5/slapos_cloud/bt/revision
master/bt5/slapos_cloud/bt/revision
+1
-1
No files found.
master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/SlaveInstanceConstraint/property_existence_constraint.xml
View file @
7c712feb
...
@@ -40,7 +40,6 @@
...
@@ -40,7 +40,6 @@
<value>
<value>
<tuple>
<tuple>
<string>
reference
</string>
<string>
reference
</string>
<string>
destination_reference
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCoreConstraint.py
View file @
7c712feb
...
@@ -302,12 +302,6 @@ class TestSlapOSSlaveInstanceConstraint(TestSlapOSConstraintMixin):
...
@@ -302,12 +302,6 @@ class TestSlapOSSlaveInstanceConstraint(TestSlapOSConstraintMixin):
'Property existence error for property reference, this document'
'Property existence error for property reference, this document'
' has no such property or the property has never been set'
)
' has no such property or the property has never been set'
)
def
test_property_existence_destination_reference
(
self
):
self
.
_test_property_existence
(
'destination_reference'
,
'Property existence error for property destination_reference, '
'this document has no such property or the property has never '
'been set'
)
def
test_predecessor_related
(
self
):
def
test_predecessor_related
(
self
):
software_instance2
=
self
.
portal
.
software_instance_module
.
newContent
(
software_instance2
=
self
.
portal
.
software_instance_module
.
newContent
(
portal_type
=
'Slave Instance'
)
portal_type
=
'Slave Instance'
)
...
...
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/instance_slap_interface_workflow/scripts/RequesterInstance_request.xml
View file @
7c712feb
...
@@ -127,15 +127,21 @@ if (request_software_instance is None):\n
...
@@ -127,15 +127,21 @@ if (request_software_instance is None):\n
else:\n
else:\n
instance_found = True\n
instance_found = True\n
# First time that the software instance is requested\n
# First time that the software instance is requested\n
if is_slave == True:\n
\n
software_instance_portal_type = "Slave Instance"\n
else:\n
software_instance_portal_type = "Software Instance"\n
# Create a new one\n
# Create a new one\n
reference = "SOFTINST-%s" % portal.portal_ids.generateNewId(\n
reference = "SOFTINST-%s" % portal.portal_ids.generateNewId(\n
id_group=\'slap_software_instance_reference\',\n
id_group=\'slap_software_instance_reference\',\n
id_generator=\'uid\')\n
id_generator=\'uid\')\n
\n
new_content_kw = {}\n
if is_slave == True:\n
software_instance_portal_type = "Slave Instance"\n
else:\n
software_instance_portal_type = "Software Instance"\n
certificate_dict = portal.portal_certificate_authority.getNewCertificate(reference)\n
certificate_dict = portal.portal_certificate_authority.getNewCertificate(reference)\n
new_content_kw[\'destination_reference\'] = certificate_dict[\'id\']\n
new_content_kw[\'ssl_key\'] = certificate_dict[\'key\']\n
new_content_kw[\'ssl_certificate\'] = certificate_dict[\'certificate\']\n
\n
\n
module = portal.getDefaultModule(portal_type="Software Instance")\n
module = portal.getDefaultModule(portal_type="Software Instance")\n
request_software_instance = module.newContent(\n
request_software_instance = module.newContent(\n
...
@@ -143,10 +149,8 @@ if (request_software_instance is None):\n
...
@@ -143,10 +149,8 @@ if (request_software_instance is None):\n
title=software_title,\n
title=software_title,\n
specialise_value=hosting_subscription,\n
specialise_value=hosting_subscription,\n
reference=reference,\n
reference=reference,\n
destination_reference=certificate_dict[\'id\'],\n
ssl_key=certificate_dict[\'key\'],\n
ssl_certificate=certificate_dict[\'certificate\'],\n
activate_kw={\'tag\': tag},\n
activate_kw={\'tag\': tag},\n
**new_content_kw\n
)\n
)\n
# request_software_instance.portal_workflow.doActionFor(request_software_instance, \'validate_action\')\n
# request_software_instance.portal_workflow.doActionFor(request_software_instance, \'validate_action\')\n
request_software_instance.validate()\n
request_software_instance.validate()\n
...
...
master/bt5/slapos_cloud/bt/revision
View file @
7c712feb
228
229
\ No newline at end of file
\ No newline at end of file
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