Merge "Shift nodepool quota from v2 to v3"
This commit is contained in:
commit
160f5bc91e
@ -47,7 +47,7 @@ providers:
|
|||||||
config-drive: true
|
config-drive: true
|
||||||
pools:
|
pools:
|
||||||
- name: main
|
- name: main
|
||||||
max-servers: 15
|
max-servers: 190
|
||||||
labels:
|
labels:
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
min-ram: 8000
|
min-ram: 8000
|
||||||
@ -101,7 +101,7 @@ providers:
|
|||||||
config-drive: true
|
config-drive: true
|
||||||
pools:
|
pools:
|
||||||
- name: main
|
- name: main
|
||||||
max-servers: 10
|
max-servers: 140
|
||||||
labels:
|
labels:
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
min-ram: 8192
|
min-ram: 8192
|
||||||
@ -155,7 +155,7 @@ providers:
|
|||||||
config-drive: true
|
config-drive: true
|
||||||
pools:
|
pools:
|
||||||
- name: main
|
- name: main
|
||||||
max-servers: 10
|
max-servers: 145
|
||||||
labels:
|
labels:
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
min-ram: 8192
|
min-ram: 8192
|
||||||
@ -209,7 +209,7 @@ providers:
|
|||||||
config-drive: true
|
config-drive: true
|
||||||
pools:
|
pools:
|
||||||
- name: main
|
- name: main
|
||||||
max-servers: 10
|
max-servers: 195
|
||||||
labels:
|
labels:
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
min-ram: 8192
|
min-ram: 8192
|
||||||
@ -252,7 +252,7 @@ providers:
|
|||||||
config-drive: true
|
config-drive: true
|
||||||
pools:
|
pools:
|
||||||
- name: main
|
- name: main
|
||||||
max-servers: 10
|
max-servers: 70
|
||||||
labels:
|
labels:
|
||||||
- name: tripleo-centos-7
|
- name: tripleo-centos-7
|
||||||
min-ram: 6144
|
min-ram: 6144
|
||||||
@ -281,7 +281,7 @@ providers:
|
|||||||
config-drive: true
|
config-drive: true
|
||||||
pools:
|
pools:
|
||||||
- name: main
|
- name: main
|
||||||
max-servers: 10
|
max-servers: 15
|
||||||
labels:
|
labels:
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
min-ram: 8000
|
min-ram: 8000
|
||||||
|
@ -45,7 +45,7 @@ providers:
|
|||||||
config-drive: true
|
config-drive: true
|
||||||
pools:
|
pools:
|
||||||
- name: main
|
- name: main
|
||||||
max-servers: 10
|
max-servers: 50
|
||||||
labels:
|
labels:
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
min-ram: 8000
|
min-ram: 8000
|
||||||
@ -260,7 +260,7 @@ providers:
|
|||||||
config-drive: true
|
config-drive: true
|
||||||
pools:
|
pools:
|
||||||
- name: main
|
- name: main
|
||||||
max-servers: 15
|
max-servers: 56
|
||||||
labels:
|
labels:
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
min-ram: 8000
|
min-ram: 8000
|
||||||
@ -313,7 +313,7 @@ providers:
|
|||||||
config-drive: true
|
config-drive: true
|
||||||
pools:
|
pools:
|
||||||
- name: main
|
- name: main
|
||||||
max-servers: 15
|
max-servers: 56
|
||||||
labels:
|
labels:
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
min-ram: 8000
|
min-ram: 8000
|
||||||
@ -367,7 +367,7 @@ providers:
|
|||||||
config-drive: true
|
config-drive: true
|
||||||
pools:
|
pools:
|
||||||
- name: main
|
- name: main
|
||||||
max-servers: 9
|
max-servers: 159
|
||||||
labels:
|
labels:
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
min-ram: 8000
|
min-ram: 8000
|
||||||
@ -421,7 +421,7 @@ providers:
|
|||||||
config-drive: true
|
config-drive: true
|
||||||
pools:
|
pools:
|
||||||
- name: main
|
- name: main
|
||||||
max-servers: 9
|
max-servers: 79
|
||||||
labels:
|
labels:
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
min-ram: 8000
|
min-ram: 8000
|
||||||
@ -454,7 +454,6 @@ providers:
|
|||||||
diskimage: ubuntu-xenial
|
diskimage: ubuntu-xenial
|
||||||
key-name: infra-root-keys
|
key-name: infra-root-keys
|
||||||
|
|
||||||
|
|
||||||
diskimages:
|
diskimages:
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
elements:
|
elements:
|
||||||
|
@ -27,7 +27,7 @@ labels:
|
|||||||
- name: debian-jessie
|
- name: debian-jessie
|
||||||
image: debian-jessie
|
image: debian-jessie
|
||||||
ready-script: configure_mirror.sh
|
ready-script: configure_mirror.sh
|
||||||
min-ready: 1
|
min-ready: 0
|
||||||
providers:
|
providers:
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
@ -45,7 +45,7 @@ labels:
|
|||||||
- name: ubuntu-trusty
|
- name: ubuntu-trusty
|
||||||
image: ubuntu-trusty
|
image: ubuntu-trusty
|
||||||
ready-script: configure_mirror.sh
|
ready-script: configure_mirror.sh
|
||||||
min-ready: 1
|
min-ready: 0
|
||||||
providers:
|
providers:
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
@ -64,7 +64,7 @@ labels:
|
|||||||
image: ubuntu-trusty
|
image: ubuntu-trusty
|
||||||
ready-script: multinode_setup.sh
|
ready-script: multinode_setup.sh
|
||||||
subnodes: 1
|
subnodes: 1
|
||||||
min-ready: 1
|
min-ready: 0
|
||||||
providers:
|
providers:
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
@ -82,7 +82,7 @@ labels:
|
|||||||
- name: ubuntu-xenial
|
- name: ubuntu-xenial
|
||||||
image: ubuntu-xenial
|
image: ubuntu-xenial
|
||||||
ready-script: configure_mirror.sh
|
ready-script: configure_mirror.sh
|
||||||
min-ready: 20
|
min-ready: 0
|
||||||
providers:
|
providers:
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
@ -101,7 +101,7 @@ labels:
|
|||||||
image: ubuntu-xenial
|
image: ubuntu-xenial
|
||||||
ready-script: multinode_setup.sh
|
ready-script: multinode_setup.sh
|
||||||
subnodes: 1
|
subnodes: 1
|
||||||
min-ready: 1
|
min-ready: 0
|
||||||
providers:
|
providers:
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
@ -120,7 +120,7 @@ labels:
|
|||||||
image: ubuntu-xenial
|
image: ubuntu-xenial
|
||||||
ready-script: multinode_setup.sh
|
ready-script: multinode_setup.sh
|
||||||
subnodes: 2
|
subnodes: 2
|
||||||
min-ready: 1
|
min-ready: 0
|
||||||
providers:
|
providers:
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
@ -138,7 +138,7 @@ labels:
|
|||||||
- name: centos-7
|
- name: centos-7
|
||||||
image: centos-7
|
image: centos-7
|
||||||
ready-script: configure_mirror.sh
|
ready-script: configure_mirror.sh
|
||||||
min-ready: 3
|
min-ready: 0
|
||||||
providers:
|
providers:
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
@ -156,7 +156,7 @@ labels:
|
|||||||
- name: fedora-26
|
- name: fedora-26
|
||||||
image: fedora-26
|
image: fedora-26
|
||||||
ready-script: configure_mirror.sh
|
ready-script: configure_mirror.sh
|
||||||
min-ready: 1
|
min-ready: 0
|
||||||
providers:
|
providers:
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
@ -174,7 +174,7 @@ labels:
|
|||||||
- name: opensuse-423
|
- name: opensuse-423
|
||||||
image: opensuse-423
|
image: opensuse-423
|
||||||
ready-script: configure_mirror.sh
|
ready-script: configure_mirror.sh
|
||||||
min-ready: 1
|
min-ready: 0
|
||||||
providers:
|
providers:
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
@ -193,7 +193,7 @@ labels:
|
|||||||
image: centos-7
|
image: centos-7
|
||||||
ready-script: multinode_setup.sh
|
ready-script: multinode_setup.sh
|
||||||
subnodes: 1
|
subnodes: 1
|
||||||
min-ready: 1
|
min-ready: 0
|
||||||
providers:
|
providers:
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
@ -212,7 +212,7 @@ labels:
|
|||||||
image: centos-7
|
image: centos-7
|
||||||
ready-script: multinode_setup.sh
|
ready-script: multinode_setup.sh
|
||||||
subnodes: 2
|
subnodes: 2
|
||||||
min-ready: 1
|
min-ready: 0
|
||||||
providers:
|
providers:
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
@ -231,7 +231,7 @@ labels:
|
|||||||
image: centos-7
|
image: centos-7
|
||||||
ready-script: multinode_setup.sh
|
ready-script: multinode_setup.sh
|
||||||
subnodes: 3
|
subnodes: 3
|
||||||
min-ready: 1
|
min-ready: 0
|
||||||
providers:
|
providers:
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
@ -249,7 +249,7 @@ labels:
|
|||||||
- name: tripleo-centos-7
|
- name: tripleo-centos-7
|
||||||
image: centos-7
|
image: centos-7
|
||||||
ready-script: configure_mirror.sh
|
ready-script: configure_mirror.sh
|
||||||
min-ready: 6
|
min-ready: 0
|
||||||
providers:
|
providers:
|
||||||
- name: tripleo-test-cloud-rh1
|
- name: tripleo-test-cloud-rh1
|
||||||
|
|
||||||
@ -259,7 +259,7 @@ providers:
|
|||||||
cloud: rax
|
cloud: rax
|
||||||
api-timeout: 60
|
api-timeout: 60
|
||||||
boot-timeout: 120
|
boot-timeout: 120
|
||||||
max-servers: 130
|
max-servers: 0
|
||||||
rate: 0.001
|
rate: 0.001
|
||||||
# Remove this when glean has support for ipv6 on centos
|
# Remove this when glean has support for ipv6 on centos
|
||||||
ipv6-preferred: false
|
ipv6-preferred: false
|
||||||
@ -319,7 +319,7 @@ providers:
|
|||||||
cloud: rax
|
cloud: rax
|
||||||
api-timeout: 60
|
api-timeout: 60
|
||||||
boot-timeout: 120
|
boot-timeout: 120
|
||||||
max-servers: 185
|
max-servers: 0
|
||||||
rate: 0.001
|
rate: 0.001
|
||||||
# Remove this when glean has support for ipv6 on centos
|
# Remove this when glean has support for ipv6 on centos
|
||||||
ipv6-preferred: false
|
ipv6-preferred: false
|
||||||
@ -439,7 +439,7 @@ providers:
|
|||||||
cloud: ovh
|
cloud: ovh
|
||||||
api-timeout: 60
|
api-timeout: 60
|
||||||
boot-timeout: 120
|
boot-timeout: 120
|
||||||
max-servers: 70
|
max-servers: 0
|
||||||
rate: 0.1
|
rate: 0.1
|
||||||
image-type: 'qcow2'
|
image-type: 'qcow2'
|
||||||
template-hostname: '{image.name}-{timestamp}'
|
template-hostname: '{image.name}-{timestamp}'
|
||||||
@ -497,7 +497,7 @@ providers:
|
|||||||
cloud: ovh
|
cloud: ovh
|
||||||
api-timeout: 60
|
api-timeout: 60
|
||||||
boot-timeout: 120
|
boot-timeout: 120
|
||||||
max-servers: 150
|
max-servers: 0
|
||||||
rate: 0.1
|
rate: 0.1
|
||||||
image-type: 'qcow2'
|
image-type: 'qcow2'
|
||||||
template-hostname: '{image.name}-{timestamp}'
|
template-hostname: '{image.name}-{timestamp}'
|
||||||
@ -555,7 +555,7 @@ providers:
|
|||||||
cloud: inap
|
cloud: inap
|
||||||
api-timeout: 60
|
api-timeout: 60
|
||||||
boot-timeout: 120
|
boot-timeout: 120
|
||||||
max-servers: 175 # standard: 190; 15 allocated to zuulv3
|
max-servers: 0
|
||||||
rate: 0.001
|
rate: 0.001
|
||||||
template-hostname: '{image.name}-{timestamp}'
|
template-hostname: '{image.name}-{timestamp}'
|
||||||
images:
|
images:
|
||||||
@ -611,7 +611,7 @@ providers:
|
|||||||
region-name: 'regionOne'
|
region-name: 'regionOne'
|
||||||
cloud: tripleo-test-cloud-rh1
|
cloud: tripleo-test-cloud-rh1
|
||||||
boot-timeout: 120
|
boot-timeout: 120
|
||||||
max-servers: 60
|
max-servers: 0
|
||||||
rate: 0.001
|
rate: 0.001
|
||||||
clean-floating-ips: true
|
clean-floating-ips: true
|
||||||
networks:
|
networks:
|
||||||
@ -807,7 +807,7 @@ providers:
|
|||||||
cloud: citycloud
|
cloud: citycloud
|
||||||
api-timeout: 60
|
api-timeout: 60
|
||||||
boot-timeout: 120
|
boot-timeout: 120
|
||||||
max-servers: 40
|
max-servers: 0
|
||||||
rate: 0.25
|
rate: 0.25
|
||||||
image-type: 'qcow2'
|
image-type: 'qcow2'
|
||||||
template-hostname: '{image.name}-{timestamp}'
|
template-hostname: '{image.name}-{timestamp}'
|
||||||
@ -923,7 +923,7 @@ providers:
|
|||||||
cloud: citycloud
|
cloud: citycloud
|
||||||
api-timeout: 60
|
api-timeout: 60
|
||||||
boot-timeout: 120
|
boot-timeout: 120
|
||||||
max-servers: 40
|
max-servers: 0
|
||||||
rate: 0.25
|
rate: 0.25
|
||||||
image-type: 'qcow2'
|
image-type: 'qcow2'
|
||||||
template-hostname: '{image.name}-{timestamp}'
|
template-hostname: '{image.name}-{timestamp}'
|
||||||
@ -981,7 +981,7 @@ providers:
|
|||||||
cloud: vexxhost
|
cloud: vexxhost
|
||||||
api-timeout: 60
|
api-timeout: 60
|
||||||
boot-timeout: 120
|
boot-timeout: 120
|
||||||
max-servers: 5
|
max-servers: 0
|
||||||
rate: 0.001
|
rate: 0.001
|
||||||
image-type: raw
|
image-type: raw
|
||||||
template-hostname: '{image.name}-{timestamp}'
|
template-hostname: '{image.name}-{timestamp}'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user