New zuulv3 syntax for nodepoolv3.yaml

We recently merged a large change to nodepool.yaml syntax, update ours
to match.

Change-Id: I2abef817e98f30a799c74ba0bb7f67d179761206
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-03-27 14:39:52 -04:00
parent 83a3bae18a
commit 17f963588f

View File

@ -11,50 +11,44 @@ zookeeper-servers:
labels: labels:
- name: ubuntu-xenial - name: ubuntu-xenial
image: ubuntu-xenial
min-ready: 2 min-ready: 2
providers:
- name: infracloud-chocolate
- name: infracloud-vanilla
providers: providers:
- name: infracloud-chocolate - name: infracloud-chocolate
region-name: 'RegionOne' region-name: 'RegionOne'
cloud: infracloud-chocolate cloud: infracloud-chocolate
api-timeout: 60
boot-timeout: 120 boot-timeout: 120
max-servers: 5
rate: 0.25 rate: 0.25
image-type: 'qcow2'
image-name-format: '{image.name}-{timestamp}' image-name-format: '{image.name}-{timestamp}'
images: diskimages:
- name: ubuntu-xenial
config-drive: true
pools:
- name: main
max-servers: 5
labels:
- name: ubuntu-xenial - name: ubuntu-xenial
min-ram: 8000 min-ram: 8000
name-filter: 'nodepool' name-filter: 'nodepool'
diskimage: ubuntu-xenial diskimage: ubuntu-xenial
username: zuul
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: infracloud-vanilla - name: infracloud-vanilla
region-name: 'RegionOne' region-name: 'RegionOne'
cloud: infracloud-vanilla cloud: infracloud-vanilla
api-timeout: 60
boot-timeout: 120 boot-timeout: 120
max-servers: 5
rate: 0.25 rate: 0.25
image-type: 'qcow2'
image-name-format: '{image.name}-{timestamp}' image-name-format: '{image.name}-{timestamp}'
images: diskimages:
- name: ubuntu-xenial
config-drive: true
pools:
- name: main
max-servers: 5
labels:
- name: ubuntu-xenial - name: ubuntu-xenial
min-ram: 8000 min-ram: 8000
name-filter: 'nodepool' name-filter: 'nodepool'
diskimage: ubuntu-xenial diskimage: ubuntu-xenial
username: zuul
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
targets:
- name: zuul
diskimages: diskimages:
- name: ubuntu-xenial - name: ubuntu-xenial