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
1
Merge Requests
1
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
Romain Courteaud
slapos.core
Commits
fda4836e
Commit
fda4836e
authored
Dec 12, 2022
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud: do not require Software Installation for Remote Node
parent
4803c9c1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputePartition_getAvailableSoftwareReleaseUrlStringList.py
...putePartition_getAvailableSoftwareReleaseUrlStringList.py
+3
-0
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Person_findPartition.py
...ateItem/portal_skins/slapos_cloud/Person_findPartition.py
+3
-1
No files found.
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputePartition_getAvailableSoftwareReleaseUrlStringList.py
View file @
fda4836e
...
...
@@ -4,6 +4,9 @@ portal = context.getPortalObject()
compute_node
=
context
.
getParentValue
()
if
slap_state
==
'free'
:
# XXX Not very elegant
if
(
compute_node
.
getPortalType
()
==
'Remote Node'
):
return
[
'ANY_URL'
]
return
compute_node
.
ComputeNode_getSoftwareReleaseUrlStringList
()
elif
slap_state
==
'busy'
:
...
...
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Person_findPartition.py
View file @
fda4836e
...
...
@@ -15,7 +15,7 @@ if software_instance_portal_type == "Slave Instance":
query_kw
[
'free_for_request'
]
=
0
elif
software_instance_portal_type
==
"Software Instance"
:
query_kw
[
'free_for_request'
]
=
1
query_kw
[
'software_release_url'
]
=
software_release_url
query_kw
[
'software_release_url'
]
=
[
software_release_url
,
"ANY_URL"
]
else
:
raise
NotImplementedError
(
"Unknown portal type %s"
%
software_instance_portal_type
)
...
...
@@ -176,6 +176,8 @@ if test_mode:
SQL_WINDOW_SIZE
=
50
context
.
log
(
portal
.
portal_catalog
.
countResults
(
src__
=
1
,
**
query_kw
))
# fetch at mot 50 random Compute Partitions, and check if they are ok
isTransitionPossible
=
portal
.
portal_workflow
.
isTransitionPossible
result_count
=
portal
.
portal_catalog
.
countResults
(
**
query_kw
)[
0
][
0
]
...
...
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