openstack/project-config
Code Issues Proposed changes

Merge "Revert "Revert "Shift nodepool quota from v2 to v3"""

Browse Source
This commit is contained in:
Zuul
2017-10-15 22:01:07 +00:00
committed by Gerrit Code Review
parent c8f90f2d15 b39f0a5d2a
commit ecd7519f8a
3 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nodepool/nl01.openstack.org.yaml
View File

@ -99,7 +99,7 @@ providers:
config-drive: true
pools:
- name: main
max-servers: 30
max-servers: 140
labels:
- name: centos-7
min-ram: 8192
@ -154,7 +154,7 @@ providers:
config-drive: true
pools:
- name: main
max-servers: 30
max-servers: 145
labels:
- name: centos-7
min-ram: 8192
@ -209,7 +209,7 @@ providers:
config-drive: true
pools:
- name: main
max-servers: 40
max-servers: 195
labels:
- name: centos-7
min-ram: 8192
@ -252,7 +252,7 @@ providers:
config-drive: true
pools:
- name: main
max-servers: 15
max-servers: 70
networks:
- private
labels:
@ -283,7 +283,7 @@ providers:
config-drive: true
pools:
- name: main
max-servers: 10
max-servers: 15
labels:
- name: centos-7
min-ram: 8000

13
nodepool/nl02.openstack.org.yaml
View File

@ -41,7 +41,7 @@ providers:
config-drive: true
pools:
- name: main
max-servers: 10
max-servers: 50
availability-zones:
- nova
labels:
@ -155,7 +155,7 @@ providers:
- name: main
availability-zones:
- nova
max-servers: 0
max-servers: 50
labels:
- name: centos-7
min-ram: 8000
@ -264,7 +264,7 @@ providers:
config-drive: true
pools:
- name: main
max-servers: 0
max-servers: 56
labels:
- name: centos-7
min-ram: 8000
@ -317,7 +317,7 @@ providers:
config-drive: true
pools:
- name: main
max-servers: 0
max-servers: 56
labels:
- name: centos-7
min-ram: 8000
@ -371,7 +371,7 @@ providers:
config-drive: true
pools:
- name: main
max-servers: 30
max-servers: 159
labels:
- name: centos-7
min-ram: 8000
@ -425,7 +425,7 @@ providers:
config-drive: true
pools:
- name: main
max-servers: 15
max-servers: 79
labels:
- name: centos-7
min-ram: 8000
@ -458,7 +458,6 @@ providers:
diskimage: ubuntu-xenial
key-name: infra-root-keys
diskimages:
- name: centos-7
elements:

48
nodepool/nodepool.yaml
View File

@ -27,7 +27,7 @@ labels:
- name: debian-jessie
image: debian-jessie
ready-script: configure_mirror.sh
min-ready: 1
min-ready: 0
providers:
- name: rax-dfw
- name: rax-ord
@ -45,7 +45,7 @@ labels:
- name: ubuntu-trusty
image: ubuntu-trusty
ready-script: configure_mirror.sh
min-ready: 1
min-ready: 0
providers:
- name: rax-dfw
- name: rax-ord
@ -64,7 +64,7 @@ labels:
image: ubuntu-trusty
ready-script: multinode_setup.sh
subnodes: 1
min-ready: 1
min-ready: 0
providers:
- name: rax-dfw
- name: rax-ord
@ -82,7 +82,7 @@ labels:
- name: ubuntu-xenial
image: ubuntu-xenial
ready-script: configure_mirror.sh
min-ready: 20
min-ready: 0
providers:
- name: rax-dfw
- name: rax-ord
@ -101,7 +101,7 @@ labels:
image: ubuntu-xenial
ready-script: multinode_setup.sh
subnodes: 1
min-ready: 1
min-ready: 0
providers:
- name: rax-dfw
- name: rax-ord
@ -120,7 +120,7 @@ labels:
image: ubuntu-xenial
ready-script: multinode_setup.sh
subnodes: 2
min-ready: 1
min-ready: 0
providers:
- name: rax-dfw
- name: rax-ord
@ -138,7 +138,7 @@ labels:
- name: centos-7
image: centos-7
ready-script: configure_mirror.sh
min-ready: 3
min-ready: 0
providers:
- name: rax-dfw
- name: rax-ord
@ -156,7 +156,7 @@ labels:
- name: fedora-26
image: fedora-26
ready-script: configure_mirror.sh
min-ready: 1
min-ready: 0
providers:
- name: rax-dfw
- name: rax-ord
@ -174,7 +174,7 @@ labels:
- name: opensuse-423
image: opensuse-423
ready-script: configure_mirror.sh
min-ready: 1
min-ready: 0
providers:
- name: rax-dfw
- name: rax-ord
@ -193,7 +193,7 @@ labels:
image: centos-7
ready-script: multinode_setup.sh
subnodes: 1
min-ready: 1
min-ready: 0
providers:
- name: rax-dfw
- name: rax-ord
@ -212,7 +212,7 @@ labels:
image: centos-7
ready-script: multinode_setup.sh
subnodes: 2
min-ready: 1
min-ready: 0
providers:
- name: rax-dfw
- name: rax-ord
@ -231,7 +231,7 @@ labels:
image: centos-7
ready-script: multinode_setup.sh
subnodes: 3
min-ready: 1
min-ready: 0
providers:
- name: rax-dfw
- name: rax-ord
@ -249,7 +249,7 @@ labels:
- name: tripleo-centos-7
image: centos-7
ready-script: configure_mirror.sh
min-ready: 6
min-ready: 0
providers:
- name: tripleo-test-cloud-rh1
@ -259,7 +259,7 @@ providers:
cloud: rax
api-timeout: 60
boot-timeout: 120
max-servers: 110
max-servers: 0
rate: 0.001
# Remove this when glean has support for ipv6 on centos
ipv6-preferred: false
@ -319,7 +319,7 @@ providers:
cloud: rax
api-timeout: 60
boot-timeout: 120
max-servers: 155
max-servers: 0
rate: 0.001
# Remove this when glean has support for ipv6 on centos
ipv6-preferred: false
@ -379,7 +379,7 @@ providers:
cloud: rax
api-timeout: 60
boot-timeout: 120
max-servers: 115
max-servers: 0
rate: 0.001
# Remove this when glean has support for ipv6 on centos
ipv6-preferred: false
@ -439,7 +439,7 @@ providers:
cloud: ovh
api-timeout: 60
boot-timeout: 120
max-servers: 64
max-servers: 0
rate: 0.1
image-type: 'qcow2'
template-hostname: '{image.name}-{timestamp}'
@ -497,7 +497,7 @@ providers:
cloud: ovh
api-timeout: 60
boot-timeout: 120
max-servers: 129
max-servers: 0
rate: 0.1
image-type: 'qcow2'
template-hostname: '{image.name}-{timestamp}'
@ -611,7 +611,7 @@ providers:
region-name: 'regionOne'
cloud: tripleo-test-cloud-rh1
boot-timeout: 120
max-servers: 55
max-servers: 0
rate: 0.001
clean-floating-ips: true
networks:
@ -631,7 +631,7 @@ providers:
cloud: infracloud-vanilla
api-timeout: 60
boot-timeout: 120
max-servers: 41
max-servers: 0
nodepool-id: 'nodepool.openstack.org'
rate: 0.25
image-type: 'qcow2'
@ -690,7 +690,7 @@ providers:
cloud: infracloud-chocolate
api-timeout: 60
boot-timeout: 120
max-servers: 41
max-servers: 0
nodepool-id: 'nodepool.openstack.org'
rate: 0.25
image-type: 'qcow2'
@ -807,7 +807,7 @@ providers:
cloud: citycloud
api-timeout: 60
boot-timeout: 120
max-servers: 40
max-servers: 0
rate: 0.25
image-type: 'qcow2'
template-hostname: '{image.name}-{timestamp}'
@ -923,7 +923,7 @@ providers:
cloud: citycloud
api-timeout: 60
boot-timeout: 120
max-servers: 40
max-servers: 0
rate: 0.25
image-type: 'qcow2'
template-hostname: '{image.name}-{timestamp}'
@ -981,7 +981,7 @@ providers:
cloud: vexxhost
api-timeout: 60
boot-timeout: 120
max-servers: 5
max-servers: 0
rate: 0.001
image-type: raw
template-hostname: '{image.name}-{timestamp}'