Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
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
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
3d51fe25
Commit
3d51fe25
authored
Oct 18, 2011
by
Łukasz Nowak
Committed by
Antoine Catton
Oct 20, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use locally provided parameters.
parent
2e7caf94
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
10 deletions
+5
-10
slapos/recipe/request.py
slapos/recipe/request.py
+5
-10
No files found.
slapos/recipe/request.py
View file @
3d51fe25
...
@@ -40,21 +40,16 @@ class Recipe(object):
...
@@ -40,21 +40,16 @@ class Recipe(object):
slap
=
slapmodule
.
slap
()
slap
=
slapmodule
.
slap
()
slap_connection
=
buildout
[
'slap_connection'
]
self
.
software_release_url
=
options
[
'software-url'
]
self
.
software_release_url
=
slap_connection
[
'software_release_url'
]
# XXX: Dirty network interation stuff
slap
.
initializeConnection
(
options
[
'server-url'
],
slap
.
initializeConnection
(
slap_connection
[
'server_url'
],
options
.
get
(
'key-file'
),
slap_connection
.
get
(
'key_file'
),
options
.
get
(
'cert-file'
),
slap_connection
.
get
(
'cert_file'
),
)
)
computer_partition
=
slap
.
registerComputerPartition
(
computer_partition
=
slap
.
registerComputerPartition
(
slap_connection
[
'computer_id'
],
slap_connection
[
'partition_
id'
])
options
[
'computer-id'
],
options
[
'partition-
id'
])
self
.
request
=
computer_partition
.
request
self
.
request
=
computer_partition
.
request
if
'software-url'
not
in
options
:
options
[
'software-url'
]
=
self
.
software_release_url
if
'name'
not
in
options
:
if
'name'
not
in
options
:
options
[
'name'
]
=
name
options
[
'name'
]
=
name
...
...
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