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
836dc719
Commit
836dc719
authored
Apr 29, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed argument name: --configuration => --parameters
parent
46c0a986
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
slapos/cli/request.py
slapos/cli/request.py
+2
-3
slapos/cli_legacy/request.py
slapos/cli_legacy/request.py
+1
-1
slapos/client.py
slapos/client.py
+1
-1
No files found.
slapos/cli/request.py
View file @
836dc719
...
...
@@ -44,8 +44,7 @@ class RequestCommand(ClientConfigCommand):
action
=
'store_true'
,
help
=
'Ask for a slave instance'
)
# XXX maybe find a better name? we already have a global --cfg option
ap
.
add_argument
(
'--configuration'
,
ap
.
add_argument
(
'--parameters'
,
nargs
=
'+'
,
help
=
"Give your configuration 'option1=value1 option2=value2'"
)
...
...
@@ -53,7 +52,7 @@ class RequestCommand(ClientConfigCommand):
def
take_action
(
self
,
args
):
args
.
node
=
parse_option_dict
(
args
.
node
)
args
.
configuration
=
parse_option_dict
(
args
.
configuration
)
args
.
parameters
=
parse_option_dict
(
args
.
parameters
)
configp
=
self
.
fetch_config
(
args
)
conf
=
ClientConfig
(
args
,
configp
)
...
...
slapos/cli_legacy/request.py
View file @
836dc719
...
...
@@ -45,7 +45,7 @@ def request():
args
=
ap
.
parse_args
()
if
args
.
configuration
:
args
.
configuration
=
argToDict
(
args
.
configuration
)
args
.
parameters
=
argToDict
(
args
.
configuration
)
if
args
.
node
:
args
.
node
=
argToDict
(
args
.
node
)
...
...
slapos/client.py
View file @
836dc719
...
...
@@ -123,7 +123,7 @@ def do_request(conf, local):
partition
=
local
[
'slap'
].
registerOpenOrder
().
request
(
software_release
=
conf
.
software_url
,
partition_reference
=
conf
.
reference
,
partition_parameter_kw
=
conf
.
configuration
,
partition_parameter_kw
=
conf
.
parameters
,
software_type
=
conf
.
type
,
filter_kw
=
conf
.
node
,
shared
=
conf
.
slave
...
...
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