Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
slapos
Commits
8f84fdae
Commit
8f84fdae
authored
Apr 04, 2014
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
runner: change parameter name authorized-key -> user-authorized-key
Thus resolving conflict with resilient stack
parent
cd99b4fe
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
software/slaprunner/README.txt
software/slaprunner/README.txt
+2
-2
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+2
-2
software/slaprunner/schema.json
software/slaprunner/schema.json
+1
-1
No files found.
software/slaprunner/README.txt
View file @
8f84fdae
...
@@ -10,7 +10,7 @@ Slaprunner is an all-in-one IDE used to develop and test profiles and recipes fo
...
@@ -10,7 +10,7 @@ Slaprunner is an all-in-one IDE used to develop and test profiles and recipes fo
Parameters
Parameters
----------
----------
authorized-key
user-
authorized-key
~~~~~~~~~~~~~~
~~~~~~~~~~~~~~
You need to specify your SSH public key in order to connect to the SSH server of this instance.
You need to specify your SSH public key in order to connect to the SSH server of this instance.
...
@@ -19,7 +19,7 @@ Example of parameter XML::
...
@@ -19,7 +19,7 @@ Example of parameter XML::
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<instance>
<instance>
<parameter id="authorized-key">ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdNp7qZMVAzNc07opHshiIFDmJpYXQpetfcSgUj39a409d42PpsJElp7WsAE/x0nN6gUIoWIl7UiAlMzf6bKEJGJVSOZEPTmiJVlgK1Gp+kE0x9yNcncYg7p38Jny0daVA/NkkpAFyRsAm5kLGzyLtaCcktSvy0cJuy7WSSHU05pd1f8Y8thofE9g5t+/JA2VZvipxPkRfkFAG3aOAGLULlTImTSDFSDFGSDFG5F6mMnl7yvY2d6vEHVBu+K+aKmAwZVfCUwtSpa/tq3i2Lppjrw3UfrxbQSFHZCkzefr+u+l4YYe+tJrX7rYJYXD7LIfZfdSeFTlHFaN/yI1 user@host.local</parameter>
<parameter id="
user-
authorized-key">ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdNp7qZMVAzNc07opHshiIFDmJpYXQpetfcSgUj39a409d42PpsJElp7WsAE/x0nN6gUIoWIl7UiAlMzf6bKEJGJVSOZEPTmiJVlgK1Gp+kE0x9yNcncYg7p38Jny0daVA/NkkpAFyRsAm5kLGzyLtaCcktSvy0cJuy7WSSHU05pd1f8Y8thofE9g5t+/JA2VZvipxPkRfkFAG3aOAGLULlTImTSDFSDFGSDFG5F6mMnl7yvY2d6vEHVBu+K+aKmAwZVfCUwtSpa/tq3i2Lppjrw3UfrxbQSFHZCkzefr+u+l4YYe+tJrX7rYJYXD7LIfZfdSeFTlHFaN/yI1 user@host.local</parameter>
</instance>
</instance>
instance-amount
instance-amount
...
...
software/slaprunner/instance-runner.cfg
View file @
8f84fdae
...
@@ -226,7 +226,7 @@ wrapper = $${directory:services}/runner_sshd
...
@@ -226,7 +226,7 @@ wrapper = $${directory:services}/runner_sshd
[dropbear-server-add-authorized-key]
[dropbear-server-add-authorized-key]
<= dropbear-runner-server
<= dropbear-runner-server
recipe = slapos.cookbook:dropbear.add_authorized_key
recipe = slapos.cookbook:dropbear.add_authorized_key
key = $${slap-parameter:authorized-key}
key = $${slap-parameter:
user-
authorized-key}
#---------------------------
#---------------------------
#--
#--
...
@@ -463,7 +463,7 @@ symlink_base = ${buildout:directory}/bin
...
@@ -463,7 +463,7 @@ symlink_base = ${buildout:directory}/bin
[slap-parameter]
[slap-parameter]
# Default value if no ssh key is specified
# Default value if no ssh key is specified
authorized-key =
user-
authorized-key =
# Default value of instances number in slaprunner
# Default value of instances number in slaprunner
instance-amount = 10
instance-amount = 10
debug = false
debug = false
...
...
software/slaprunner/schema.json
View file @
8f84fdae
{
{
"$schema"
:
"http://json-schema.org/draft-04/schema#"
,
"$schema"
:
"http://json-schema.org/draft-04/schema#"
,
"properties"
:
{
"properties"
:
{
"authorized-key"
:
{
"
user-
authorized-key"
:
{
"description"
:
"SSH public key in order to connect to the SSH server of this runner instance"
,
"description"
:
"SSH public key in order to connect to the SSH server of this runner instance"
,
"type"
:
"string"
"type"
:
"string"
},
},
...
...
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