zuul/nodepool
Code Issues Proposed changes

Merge "Clarify meaning of Jenkins master configuration settings in target"

Browse Source
This commit is contained in:
Jenkins 2015-08-14 23:05:37 +00:00 committed by Gerrit Code Review
commit 0a7778743a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/source/configuration.rst
View File

@ -511,9 +511,14 @@ across all of the targets which are on-line::
API key generated by Jenkins (not the user password).
``credentials-id`` (optional)
If provided, Nodepool will configure the Jenkins slave to use the Jenkins
credential identified by that ID, otherwise it will use the username and
ssh keys configured in the image.
This credential is used by the Jenkins Master to login to the configured
Slaves.
If provided, it is used by the Jenkins Master to log in to the Jenkins
Slaves. This id is a Jenkins credential identified by that ID. If not
provided it will use the username and ssh keys configured in the image
instead. In this case ensure that the path to the ssh keys exist on the
Jenkins Master system as well as your Nodepool system.
``test-job`` (optional)
Setting this would cause a newly created instance to be in a TEST state.