openstack/project-config
Code Issues Proposed changes

Remove plain images

Browse Source 
These are no longer necessary after the merge of
I76befd9e2a054798e8e36500b723870f7c7ae328.

Depends-On: https://review.opendev.org/735774
Change-Id: Id98743d6d2884a15e8496bdefb764287f37cd248
This commit is contained in:
Ian Wienand 2020-06-16 16:29:17 +10:00
parent 5e6125346c
commit 5580f9057f
2 changed files with 1 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,16 +38,6 @@ labels:
min-ready: 1 min-ready: 1
- name: ubuntu-xenial - name: ubuntu-xenial
min-ready: 1 min-ready: 1
# 2020-04-28 : temporary node types as we transition from
# pip-and-virtualenv element
- name: ubuntu-bionic-plain
min-ready: 0
- name: ubuntu-xenial-plain
min-ready: 0
- name: centos-7-plain
min-ready: 0
- name: centos-8-plain
min-ready: 0
providers: providers:
- name: rax-dfw - name: rax-dfw
@ -81,14 +71,6 @@ providers:
config-drive: true config-drive: true
- name: ubuntu-xenial - name: ubuntu-xenial
config-drive: true config-drive: true
- name: ubuntu-bionic-plain
config-drive: true
- name: ubuntu-xenial-plain
config-drive: true
- name: centos-7-plain
config-drive: true
- name: centos-8-plain
config-drive: true
pools: pools:
- name: main - name: main
max-servers: 140 max-servers: 140
@ -153,26 +135,6 @@ providers:
flavor-name: 'Performance' flavor-name: 'Performance'
diskimage: ubuntu-xenial diskimage: ubuntu-xenial
key-name: infra-root-keys-2020-05-13 key-name: infra-root-keys-2020-05-13
- name: ubuntu-bionic-plain
min-ram: 8192
flavor-name: 'Performance'
diskimage: ubuntu-bionic-plain
key-name: infra-root-keys-2020-05-13
- name: ubuntu-xenial-plain
min-ram: 8192
flavor-name: 'Performance'
diskimage: ubuntu-xenial-plain
key-name: infra-root-keys-2020-05-13
- name: centos-7-plain
min-ram: 8192
flavor-name: 'Performance'
diskimage: centos-7-plain
key-name: infra-root-keys-2020-05-13
- name: centos-8-plain
min-ram: 8192
flavor-name: 'Performance'
diskimage: centos-8-plain
key-name: infra-root-keys-2020-05-13
- name: rax-iad - name: rax-iad
region-name: 'IAD' region-name: 'IAD'
cloud: rax cloud: rax
@ -211,7 +173,3 @@ diskimages:
- name: ubuntu-bionic - name: ubuntu-bionic
- name: ubuntu-focal - name: ubuntu-focal
- name: ubuntu-xenial - name: ubuntu-xenial
- name: ubuntu-bionic-plain
- name: ubuntu-xenial-plain
- name: centos-7-plain
- name: centos-8-plain

74
nodepool/nodepool.yaml
View File

@ -15,14 +15,10 @@ providers:
cloud: ovh cloud: ovh
rate: 0.1 rate: 0.1
diskimages: &provider_diskimages diskimages: &provider_diskimages
- name: centos-7-plain
config-drive: true
- name: centos-7 - name: centos-7
config-drive: true config-drive: true
- name: centos-8 - name: centos-8
config-drive: true config-drive: true
- name: centos-8-plain
config-drive: true
- name: debian-buster - name: debian-buster
config-drive: true config-drive: true
- name: debian-stretch - name: debian-stretch
@ -39,14 +35,10 @@ providers:
config-drive: true config-drive: true
- name: ubuntu-bionic - name: ubuntu-bionic
config-drive: true config-drive: true
- name: ubuntu-bionic-plain
config-drive: true
- name: ubuntu-focal - name: ubuntu-focal
config-drive: true config-drive: true
- name: ubuntu-xenial - name: ubuntu-xenial
config-drive: true config-drive: true
- name: ubuntu-xenial-plain
config-drive: true
- name: ovh-gra1 - name: ovh-gra1
region-name: 'GRA1' region-name: 'GRA1'
@ -138,20 +130,6 @@ diskimages:
DIB_DISABLE_APT_CLEANUP: '1' DIB_DISABLE_APT_CLEANUP: '1'
DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
# NOTE(ianw) 2020-02-17: we are working to remove pip-and-virtualenv
# as a requirement; as we cut images over we can remove these.
- name: base-with-pip
abstract: True
parent: base
elements:
- pip-and-virtualenv
- name: base-debuntu-with-pip
abstract: True
parent: base-debuntu
elements:
- pip-and-virtualenv
############ CentOS and Fedora ############# ############ CentOS and Fedora #############
@ -315,55 +293,3 @@ diskimages:
env-vars: env-vars:
DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.opendev.org/ubuntu' DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.opendev.org/ubuntu'
DIB_DEBIAN_COMPONENTS: 'main,universe' DIB_DEBIAN_COMPONENTS: 'main,universe'
############ Plain images #############
# NOTE(ianw) 2020-03-16 : these are alternative images without the
# pip-and-virtualenv element we can test ansible roles to achieve
# full backwards-compatability with.
- name: ubuntu-bionic-plain
parent: base-debuntu
pause: false
elements:
- ubuntu-minimal
- cache-devstack
release: bionic
env-vars:
DIB_DISTRIBUTION_MIRROR: 'https://mirror.dfw.rax.opendev.org/ubuntu'
DIB_DEBIAN_COMPONENTS: 'main,universe'
- name: ubuntu-xenial-plain
parent: base-debuntu
pause: false
elements:
- ubuntu-minimal
- cache-devstack
release: xenial
env-vars:
DIB_DISTRIBUTION_MIRROR: 'https://mirror.dfw.rax.opendev.org/ubuntu'
DIB_DEBIAN_COMPONENTS: 'main,universe'
- name: centos-7-plain
parent: base
pause: false
release: '7'
elements:
- cache-devstack
- centos-minimal
- epel
env-vars:
DIB_EPEL_DISABLED: '1'
- name: centos-8-plain
parent: base
pause: false
python-path: /usr/bin/python3
release: '8'
elements:
- cache-devstack
- centos-minimal
- epel
env-vars:
DIB_EPEL_DISABLED: '1'