Remove diskimages section from nodepool-launchers
Because nodepool-launcher don't build diskimages, we don't need to carry this configuration. It help to remove duplicate data. Also update tox.ini to test all versions of nodepool.yaml files. Change-Id: Id4ed7b2d2bee15a057db837508c9c9a507725efc Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
ffeb337390
commit
7885d734e6
|
@ -348,155 +348,3 @@ providers:
|
|||
flavor-name: 'v1-standard-8'
|
||||
diskimage: ubuntu-xenial
|
||||
key-name: infra-root-keys
|
||||
|
||||
diskimages:
|
||||
- name: centos-7
|
||||
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'
|
||||
- name: debian-jessie
|
||||
elements:
|
||||
- debian-minimal
|
||||
- vm
|
||||
- simple-init
|
||||
- openstack-repos
|
||||
- nodepool-base
|
||||
- cache-devstack
|
||||
- growroot
|
||||
- infra-package-needs
|
||||
release: jessie
|
||||
env-vars:
|
||||
TMPDIR: /opt/dib_tmp
|
||||
DIB_CHECKSUM: '1'
|
||||
DIB_IMAGE_CACHE: /opt/dib_cache
|
||||
DIB_APT_LOCAL_CACHE: '0'
|
||||
DIB_DISABLE_APT_CLEANUP: '1'
|
||||
DIB_DISTRIBUTION_MIRROR: http://ftp.us.debian.org/debian/
|
||||
DIB_GRUB_TIMEOUT: '0'
|
||||
- name: fedora-26
|
||||
elements:
|
||||
- fedora-minimal
|
||||
- vm
|
||||
- simple-init
|
||||
- openstack-repos
|
||||
- nodepool-base
|
||||
- cache-devstack
|
||||
- initialize-urandom
|
||||
- growroot
|
||||
- infra-package-needs
|
||||
release: 26
|
||||
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'
|
||||
- name: fedora-27
|
||||
elements:
|
||||
- fedora-minimal
|
||||
- vm
|
||||
- simple-init
|
||||
- openstack-repos
|
||||
- nodepool-base
|
||||
- cache-devstack
|
||||
- initialize-urandom
|
||||
- growroot
|
||||
- infra-package-needs
|
||||
release: 27
|
||||
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'
|
||||
- name: gentoo
|
||||
elements:
|
||||
- gentoo
|
||||
- vm
|
||||
- simple-init
|
||||
- openstack-repos
|
||||
- nodepool-base
|
||||
- growroot
|
||||
- infra-package-needs
|
||||
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'
|
||||
GENTOO_PORTAGE_CLEANUP: 'True'
|
||||
DIB_INSTALLTYPE_pip_and_virtualenv: 'package'
|
||||
DIB_INSTALLTYPE_simple_init: 'repo'
|
||||
GENTOO_PYTHON_TARGETS: 'python2_7 python3_5'
|
||||
GENTOO_PYTHON_ACTIVE_VERSION: python3.5
|
||||
- name: opensuse-423
|
||||
elements:
|
||||
- opensuse-minimal
|
||||
- vm
|
||||
- simple-init
|
||||
- openstack-repos
|
||||
- nodepool-base
|
||||
- cache-devstack
|
||||
- growroot
|
||||
- infra-package-needs
|
||||
release: '42.3'
|
||||
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'
|
||||
- name: ubuntu-trusty
|
||||
elements:
|
||||
- ubuntu-minimal
|
||||
- vm
|
||||
- simple-init
|
||||
- openstack-repos
|
||||
- nodepool-base
|
||||
- cache-devstack
|
||||
- initialize-urandom
|
||||
- growroot
|
||||
- infra-package-needs
|
||||
release: trusty
|
||||
env-vars:
|
||||
TMPDIR: /opt/dib_tmp
|
||||
DIB_CHECKSUM: '1'
|
||||
DIB_IMAGE_CACHE: /opt/dib_cache
|
||||
DIB_APT_LOCAL_CACHE: '0'
|
||||
DIB_DISABLE_APT_CLEANUP: '1'
|
||||
DIB_GRUB_TIMEOUT: '0'
|
||||
DIB_DEBIAN_COMPONENTS: 'main,universe'
|
||||
- name: ubuntu-xenial
|
||||
elements:
|
||||
- ubuntu-minimal
|
||||
- vm
|
||||
- simple-init
|
||||
- openstack-repos
|
||||
- nodepool-base
|
||||
- cache-devstack
|
||||
- initialize-urandom
|
||||
- growroot
|
||||
- infra-package-needs
|
||||
release: xenial
|
||||
env-vars:
|
||||
TMPDIR: /opt/dib_tmp
|
||||
DIB_CHECKSUM: '1'
|
||||
DIB_IMAGE_CACHE: /opt/dib_cache
|
||||
DIB_APT_LOCAL_CACHE: '0'
|
||||
DIB_DISABLE_APT_CLEANUP: '1'
|
||||
DIB_GRUB_TIMEOUT: '0'
|
||||
DIB_DEBIAN_COMPONENTS: 'main,universe'
|
||||
|
|
|
@ -459,155 +459,3 @@ providers:
|
|||
flavor-name: ssd-osFoundation-3
|
||||
diskimage: ubuntu-xenial
|
||||
key-name: infra-root-keys
|
||||
|
||||
diskimages:
|
||||
- name: centos-7
|
||||
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'
|
||||
- name: debian-jessie
|
||||
elements:
|
||||
- debian-minimal
|
||||
- vm
|
||||
- simple-init
|
||||
- openstack-repos
|
||||
- nodepool-base
|
||||
- cache-devstack
|
||||
- growroot
|
||||
- infra-package-needs
|
||||
release: jessie
|
||||
env-vars:
|
||||
TMPDIR: /opt/dib_tmp
|
||||
DIB_CHECKSUM: '1'
|
||||
DIB_IMAGE_CACHE: /opt/dib_cache
|
||||
DIB_APT_LOCAL_CACHE: '0'
|
||||
DIB_DISABLE_APT_CLEANUP: '1'
|
||||
DIB_DISTRIBUTION_MIRROR: http://ftp.us.debian.org/debian/
|
||||
DIB_GRUB_TIMEOUT: '0'
|
||||
- name: fedora-26
|
||||
elements:
|
||||
- fedora-minimal
|
||||
- vm
|
||||
- simple-init
|
||||
- openstack-repos
|
||||
- nodepool-base
|
||||
- cache-devstack
|
||||
- initialize-urandom
|
||||
- growroot
|
||||
- infra-package-needs
|
||||
release: 26
|
||||
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'
|
||||
- name: fedora-27
|
||||
elements:
|
||||
- fedora-minimal
|
||||
- vm
|
||||
- simple-init
|
||||
- openstack-repos
|
||||
- nodepool-base
|
||||
- cache-devstack
|
||||
- initialize-urandom
|
||||
- growroot
|
||||
- infra-package-needs
|
||||
release: 27
|
||||
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'
|
||||
- name: gentoo
|
||||
elements:
|
||||
- gentoo
|
||||
- vm
|
||||
- simple-init
|
||||
- openstack-repos
|
||||
- nodepool-base
|
||||
- growroot
|
||||
- infra-package-needs
|
||||
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'
|
||||
GENTOO_PORTAGE_CLEANUP: 'True'
|
||||
DIB_INSTALLTYPE_pip_and_virtualenv: 'package'
|
||||
DIB_INSTALLTYPE_simple_init: 'repo'
|
||||
GENTOO_PYTHON_TARGETS: 'python2_7 python3_5'
|
||||
GENTOO_PYTHON_ACTIVE_VERSION: python3.5
|
||||
- name: opensuse-423
|
||||
elements:
|
||||
- opensuse-minimal
|
||||
- vm
|
||||
- simple-init
|
||||
- openstack-repos
|
||||
- nodepool-base
|
||||
- cache-devstack
|
||||
- growroot
|
||||
- infra-package-needs
|
||||
release: '42.3'
|
||||
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'
|
||||
- name: ubuntu-trusty
|
||||
elements:
|
||||
- ubuntu-minimal
|
||||
- vm
|
||||
- simple-init
|
||||
- openstack-repos
|
||||
- nodepool-base
|
||||
- cache-devstack
|
||||
- initialize-urandom
|
||||
- growroot
|
||||
- infra-package-needs
|
||||
release: trusty
|
||||
env-vars:
|
||||
TMPDIR: /opt/dib_tmp
|
||||
DIB_CHECKSUM: '1'
|
||||
DIB_IMAGE_CACHE: /opt/dib_cache
|
||||
DIB_APT_LOCAL_CACHE: '0'
|
||||
DIB_DISABLE_APT_CLEANUP: '1'
|
||||
DIB_GRUB_TIMEOUT: '0'
|
||||
DIB_DEBIAN_COMPONENTS: 'main,universe'
|
||||
- name: ubuntu-xenial
|
||||
elements:
|
||||
- ubuntu-minimal
|
||||
- vm
|
||||
- simple-init
|
||||
- openstack-repos
|
||||
- nodepool-base
|
||||
- cache-devstack
|
||||
- initialize-urandom
|
||||
- growroot
|
||||
- infra-package-needs
|
||||
release: xenial
|
||||
env-vars:
|
||||
TMPDIR: /opt/dib_tmp
|
||||
DIB_CHECKSUM: '1'
|
||||
DIB_IMAGE_CACHE: /opt/dib_cache
|
||||
DIB_APT_LOCAL_CACHE: '0'
|
||||
DIB_DISABLE_APT_CLEANUP: '1'
|
||||
DIB_GRUB_TIMEOUT: '0'
|
||||
DIB_DEBIAN_COMPONENTS: 'main,universe'
|
||||
|
|
5
tox.ini
5
tox.ini
|
@ -101,7 +101,10 @@ changedir = {toxinidir}/nodepool
|
|||
commands = env ELEMENTS_DIR=elements dib-lint
|
||||
|
||||
[testenv:nodepool]
|
||||
commands = nodepool -c {toxinidir}/nodepool/nodepool.yaml config-validate
|
||||
commands =
|
||||
nodepool -c {toxinidir}/nodepool/nodepool.yaml config-validate
|
||||
nodepool -c {toxinidir}/nodepool/nl01.openstack.org.yaml config-validate
|
||||
nodepool -c {toxinidir}/nodepool/nl02.openstack.org.yaml config-validate
|
||||
|
||||
[testenv:add-projects-to-main]
|
||||
basepython = python3
|
||||
|
|
Loading…
Reference in New Issue