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
Léo-Paul Géneau
slapos.core
Commits
ab8ea0b7
Commit
ab8ea0b7
authored
Nov 10, 2014
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos.proxy: fix slave requests.
Include correct partition_reference.
parent
09992a50
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
slapos/proxy/views.py
slapos/proxy/views.py
+6
-1
No files found.
slapos/proxy/views.py
View file @
ab8ea0b7
...
@@ -634,7 +634,12 @@ def requestSlave(software_release, software_type, partition_reference, partition
...
@@ -634,7 +634,12 @@ def requestSlave(software_release, software_type, partition_reference, partition
a
(
software_type
)
a
(
software_type
)
if
'instance_guid'
in
filter_kw
:
if
'instance_guid'
in
filter_kw
:
q
+=
' AND reference=?'
q
+=
' AND reference=?'
a
(
filter_kw
[
'instance_guid'
])
# instance_guid should be like: %s-%s % (requested_computer_id, partition_id)
# But code is convoluted here, so we check
if
instance_guid
.
startswith
(
requested_computer_id
):
a
(
instance_guid
[
len
(
requested_computer_id
)
+
1
:])
else
:
a
(
instance_guid
)
partition
=
execute_db
(
'partition'
,
q
,
args
,
one
=
True
)
partition
=
execute_db
(
'partition'
,
q
,
args
,
one
=
True
)
if
partition
is
None
:
if
partition
is
None
:
...
...
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