Commit 8f84fdae authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

runner: change parameter name authorized-key -> user-authorized-key

Thus resolving conflict with resilient stack
parent cd99b4fe
...@@ -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
......
...@@ -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
......
{ {
"$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"
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment