arm64: remove min-ram constraints
All of the flavor names in use here should be matched exactly. min-ram (as described at [1]) when used in combination with flavor-name actually has the wrong semantics for us, as this chooses a flavor that "meets providers.labels.min-ram and also contain flavor-name". This can cause the wrong flavor to be picked up if they use the same prefix. [1] https://zuul-ci.org/docs/nodepool/3.10.0/configuration.html#attr-providers.[openstack].pools.labels.flavor-name Change-Id: Iecd0e9cfe7d7f1f28dd8d0c5ce9beb6bbdf357e8
This commit is contained in:
parent
ac0375de48
commit
83f9c7ec49
@ -379,67 +379,54 @@ providers:
|
||||
max-servers: 40
|
||||
labels:
|
||||
- name: centos-9-stream-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'os.large'
|
||||
diskimage: centos-9-stream-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: centos-8-stream-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'os.large'
|
||||
diskimage: centos-8-stream-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: debian-bullseye-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'os.large'
|
||||
diskimage: debian-bullseye-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: debian-buster-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'os.large'
|
||||
diskimage: debian-buster-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-bionic-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'os.large'
|
||||
diskimage: ubuntu-bionic-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-bionic-arm64-16C-16GB
|
||||
min-ram: 16000
|
||||
flavor-name: 'm1.xxxlarge'
|
||||
diskimage: ubuntu-bionic-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-focal-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'os.large'
|
||||
diskimage: ubuntu-focal-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-focal-arm64-16C-16GB
|
||||
min-ram: 16000
|
||||
flavor-name: 'm1.xxxlarge'
|
||||
diskimage: ubuntu-focal-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-jammy-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'os.large'
|
||||
diskimage: ubuntu-jammy-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-jammy-arm64-16C-16GB
|
||||
min-ram: 16000
|
||||
flavor-name: 'm1.xxxlarge'
|
||||
diskimage: ubuntu-jammy-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: openEuler-22-03-LTS-arm64-16C-16GB
|
||||
min-ram: 16000
|
||||
flavor-name: 'm1.xxxlarge'
|
||||
diskimage: openEuler-22-03-LTS-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: rockylinux-9-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'os.large'
|
||||
diskimage: rockylinux-9-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: rockylinux-9-arm64-16C-16GB
|
||||
min-ram: 16000
|
||||
flavor-name: 'm1.xxxlarge'
|
||||
diskimage: rockylinux-9-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
@ -474,67 +461,54 @@ providers:
|
||||
max-servers: 40
|
||||
labels:
|
||||
- name: centos-9-stream-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev'
|
||||
diskimage: centos-9-stream-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: centos-8-stream-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev'
|
||||
diskimage: centos-8-stream-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: debian-bullseye-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev'
|
||||
diskimage: debian-bullseye-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: debian-buster-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev'
|
||||
diskimage: debian-buster-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-bionic-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev'
|
||||
diskimage: ubuntu-bionic-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-bionic-arm64-16C-16GB
|
||||
min-ram: 16000
|
||||
flavor-name: 'opendev-16C-16GB'
|
||||
diskimage: ubuntu-bionic-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-focal-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev'
|
||||
diskimage: ubuntu-focal-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-focal-arm64-16C-16GB
|
||||
min-ram: 16000
|
||||
flavor-name: 'opendev-16C-16GB'
|
||||
diskimage: ubuntu-focal-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-jammy-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev'
|
||||
diskimage: ubuntu-jammy-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-jammy-arm64-16C-16GB
|
||||
min-ram: 16000
|
||||
flavor-name: 'opendev-16C-16GB'
|
||||
diskimage: ubuntu-jammy-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: openEuler-22-03-LTS-arm64-16C-16GB
|
||||
min-ram: 16000
|
||||
flavor-name: 'opendev-16C-16GB'
|
||||
diskimage: openEuler-22-03-LTS-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: rockylinux-9-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev'
|
||||
diskimage: rockylinux-9-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: rockylinux-9-arm64-16C-16GB
|
||||
min-ram: 16000
|
||||
flavor-name: 'opendev-16C-16GB'
|
||||
diskimage: rockylinux-9-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
@ -567,42 +541,34 @@ providers:
|
||||
max-servers: 15
|
||||
labels:
|
||||
- name: centos-9-stream-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev.large'
|
||||
diskimage: centos-9-stream-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: centos-8-stream-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev.large'
|
||||
diskimage: centos-8-stream-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: debian-bullseye-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev.large'
|
||||
diskimage: debian-bullseye-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: debian-buster-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev.large'
|
||||
diskimage: debian-buster-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: rockylinux-9-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev.large'
|
||||
diskimage: rockylinux-9-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-bionic-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev.large'
|
||||
diskimage: ubuntu-bionic-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-focal-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev.large'
|
||||
diskimage: ubuntu-focal-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
- name: ubuntu-jammy-arm64
|
||||
min-ram: 8000
|
||||
flavor-name: 'opendev.large'
|
||||
diskimage: ubuntu-jammy-arm64
|
||||
key-name: infra-root-keys-2020-05-13
|
||||
|
Loading…
Reference in New Issue
Block a user