zuul/nodepool
Code Issues Proposed changes

Merge "hostname & subnode-hostname is taken from targets instead of labels"

Browse Source
This commit is contained in:
Jenkins 2014-10-15 22:17:19 +00:00 committed by Gerrit Code Review
commit 6b3acd0394
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/configuration.rst
View File

@ -121,8 +121,6 @@ providers or images are used to create them). Example::
- name: my-precise
image: precise
min-ready: 2
hostname: '{label.name}-{provider.name}-{node_id}.slave.openstack.org'
subnode-hostname: '{label.name}-{provider.name}-{node_id}-{subnode_id}.slave.openstack.org'
providers:
- name: provider1
- name: provider2
@ -130,8 +128,6 @@ providers or images are used to create them). Example::
image: precise
subnodes: 2
min-ready: 2
hostname: '{label.name}-{provider.name}-{node_id}'
subnode-hostname: '{label.name}-{provider.name}-{node_id}-{subnode_id}'
ready-script: setup_multinode.sh
providers:
- name: provider1
@ -301,12 +297,16 @@ across all of the targets which are on-line::
user: username
apikey: key
credentials-id: id
hostname: '{label.name}-{provider.name}-{node_id}.slave.openstack.org'
subnode-hostname: '{label.name}-{provider.name}-{node_id}-{subnode_id}.slave.openstack.org'
- name: jenkins2
jenkins:
url: https://jenkins2.example.org/
user: username
apikey: key
credentials-id: id
hostname: '{label.name}-{provider.name}-{node_id}'
subnode-hostname: '{label.name}-{provider.name}-{node_id}-{subnode_id}'
For targets, the `name` is required. If using Jenkins, the `url`,
`user`, and `apikey` keys are required. If the `credentials-id` key