openstack
/
project-config
Code Issues Proposed changes

Revert "Add CentOS NetworkManager testing node" 

This reverts commit 32e63aa0c8 (and
small follow-on fix 0eeb4395d1)

The base CentOS node is switched to NetworkManager support

Change-Id: Ic254273afdf0637194b608b781ea9e3ff4bd73a3
This commit is contained in:
Ian Wienand 2019-01-10 10:04:23 +11:00
parent 0eeb4395d1
commit 1fdd6945d6
5 changed files with 0 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,8 +15,6 @@ zookeeper-servers:
labels:
- name: centos-7
min-ready: 1
- name: centos-7-nm
min-ready: 1
- name: debian-stretch
min-ready: 1
- name: fedora-28
@ -48,8 +46,6 @@ providers:
diskimages: &provider_diskimages
- name: centos-7
config-drive: true
- name: centos-7-nm
config-drive: true
- name: debian-stretch
config-drive: true
- name: fedora-28
@ -79,11 +75,6 @@ providers:
flavor-name: 'Performance'
diskimage: centos-7
key-name: infra-root-keys-2018-06-15
- name: centos-7-nm
min-ram: 8192
flavor-name: 'Performance'
diskimage: centos-7-nm
key-name: infra-root-keys-2018-06-15
- name: debian-stretch
min-ram: 8000
flavor-name: 'Performance'
@ -162,7 +153,6 @@ providers:
diskimages:
- name: centos-7
- name: centos-7-nm
- name: debian-stretch
- name: fedora-28
- name: fedora-29

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

@ -14,7 +14,6 @@ zookeeper-servers:
# another launcher will need to assume this logic.
labels:
- name: centos-7
- name: centos-7-nm
- name: debian-stretch
- name: fedora-28
- name: fedora-29
@ -37,8 +36,6 @@ providers:
diskimages: &provider_diskimages
- name: centos-7
config-drive: true
- name: centos-7-nm
config-drive: true
- name: debian-stretch
config-drive: true
- name: fedora-28
@ -72,11 +69,6 @@ providers:
flavor-name: '8C-8GB-100GB'
diskimage: centos-7
key-name: infra-root-keys-2018-06-15
- name: centos-7-nm
min-ram: 8000
flavor-name: '8C-8GB-100GB'
diskimage: centos-7-nm
key-name: infra-root-keys-2018-06-15
- name: debian-stretch
min-ram: 8000
flavor-name: '8C-8GB-100GB'
@ -195,11 +187,6 @@ providers:
flavor-name: 'nodepool.0'
diskimage: centos-7
key-name: infra-root-keys-2018-06-15
- name: centos-7-nm
min-ram: 8000
flavor-name: 'nodepool.0'
diskimage: centos-7-nm
key-name: infra-root-keys-2018-06-15
- name: debian-stretch
min-ram: 8000
flavor-name: 'nodepool.0'
@ -268,11 +255,6 @@ providers:
flavor-name: 'zuul-flavor'
diskimage: centos-7
key-name: infra-root-keys-2018-06-15
- name: centos-7-nm
min-ram: 8000
flavor-name: 'zuul-flavor'
diskimage: centos-7-nm
key-name: infra-root-keys-2018-06-15
- name: debian-stretch
min-ram: 8000
flavor-name: 'zuul-flavor'
@ -326,7 +308,6 @@ providers:
diskimages:
- name: centos-7
- name: centos-7-nm
- name: debian-stretch
- name: fedora-28
- name: fedora-29

14
nodepool/nl03.openstack.org.yaml
View File

@ -17,7 +17,6 @@ zookeeper-servers:
# ubuntu-xenial-arm64 being one of them.
labels:
- name: centos-7
- name: centos-7-nm
- name: debian-stretch
- name: debian-stretch-arm64
min-ready: 1
@ -154,11 +153,6 @@ providers:
flavor-name: 'osf-highcpu-8'
diskimage: centos-7
key-name: infra-root-keys-2018-06-15
- name: centos-7-nm
min-ram: 8000
flavor-name: 'osf-highcpu-8'
diskimage: centos-7-nm
key-name: infra-root-keys-2018-06-15
- name: debian-stretch
min-ram: 8000
flavor-name: 'osf-highcpu-8'
@ -245,13 +239,6 @@ providers:
volume-size: 80
diskimage: centos-7
key-name: infra-root-keys-2018-06-15
- name: centos-7-nm
min-ram: 8000
flavor-name: v2-highcpu-8
boot-from-volume: true
volume-size: 80
diskimage: centos-7-nm
key-name: infra-root-keys-2018-06-15
- name: debian-stretch
min-ram: 8000
flavor-name: v2-highcpu-8
@ -455,7 +442,6 @@ providers:
diskimages:
- name: centos-7
- name: centos-7-nm
- name: debian-stretch
- name: debian-stretch-arm64
- name: fedora-28

11
nodepool/nl04.openstack.org.yaml
View File

@ -14,7 +14,6 @@ zookeeper-servers:
# another launcher will need to assume this logic.
labels:
- name: centos-7
- name: centos-7-nm
- name: debian-stretch
- name: fedora-28
- name: fedora-29
@ -36,8 +35,6 @@ providers:
diskimages: &provider_diskimages
- name: centos-7
config-drive: true
- name: centos-7-nm
config-drive: true
- name: debian-stretch
config-drive: true
- name: fedora-28
@ -69,13 +66,6 @@ providers:
key-name: infra-root-keys-2018-06-15
instance-properties:
glean_ignore_interfaces: 'True'
- name: centos-7-nm
min-ram: 8000
flavor-name: ssd-osFoundation-3
diskimage: centos-7-nm
key-name: infra-root-keys-2018-06-15
instance-properties:
glean_ignore_interfaces: 'True'
- name: debian-stretch
min-ram: 8000
flavor-name: ssd-osFoundation-3
@ -161,7 +151,6 @@ providers:
diskimages:
- name: centos-7
- name: centos-7-nm
- name: debian-stretch
- name: fedora-28
- name: fedora-29

24
nodepool/nodepool.yaml
View File

@ -43,8 +43,6 @@ providers:
diskimages: &provider_diskimages
- name: centos-7
config-drive: true
- name: centos-7-nm
config-drive: true
- name: debian-stretch
config-drive: true
- name: fedora-28
@ -122,28 +120,6 @@ providers:
diskimages:
- name: centos-7
pause: false
elements:
- centos-minimal
- vm
- simple-init
- openstack-repos
- nodepool-base
- cache-devstack
- growroot
- infra-package-needs
- epel
env-vars:
TMPDIR: /opt/dib_tmp
DIB_CHECKSUM: '1'
DIB_IMAGE_CACHE: /opt/dib_cache
QEMU_IMG_OPTIONS: compat=0.10
DIB_GRUB_TIMEOUT: '0'
DIB_EPEL_DISABLED: '1'
GIT_HTTP_LOW_SPEED_TIME: '300'
GIT_HTTP_LOW_SPEED_LIMIT: '1000'
# Temporary node to test NetworkManager based boots
- name: centos-7-nm
pause: false
elements:
- centos-minimal