From 7c4da0c8b8bc6d3cfb10c77511cbb57cf13a7a0e Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 18 Jan 2018 21:17:17 +0000 Subject: [PATCH] Revert "Remove diskimages section from nodepool-launchers" We seem to be having exceptions now: 2018-01-18 21:15:29,955 ERROR nodepool.NodePool: Exception in main loop: Traceback (most recent call last): File "/usr/local/lib/python3.5/dist-packages/nodepool/launcher.py", line 893, in run while not self._stopped: File "/usr/local/lib/python3.5/dist-packages/nodepool/launcher.py", line 758, in updateConfig File "/usr/local/lib/python3.5/dist-packages/nodepool/launcher.py", line 721, in loadConfig File "/usr/local/lib/python3.5/dist-packages/nodepool/config.py", line 148, in loadConfig p.load(newconfig) File "/usr/local/lib/python3.5/dist-packages/nodepool/driver/openstack/config.py", line 127, in load diskimage = config.diskimages[i.name] KeyError: 'centos-7' This reverts commit 7885d734e6de9ae0e69de75b7eaa2b4110808899. Change-Id: I43e73abac15828af1c0be514dcff3d370765f2ec --- nodepool/nl01.openstack.org.yaml | 152 +++++++++++++++++++++++++++++++ nodepool/nl02.openstack.org.yaml | 152 +++++++++++++++++++++++++++++++ tox.ini | 5 +- 3 files changed, 305 insertions(+), 4 deletions(-) diff --git a/nodepool/nl01.openstack.org.yaml b/nodepool/nl01.openstack.org.yaml index 6be1d23054..0d124619e2 100644 --- a/nodepool/nl01.openstack.org.yaml +++ b/nodepool/nl01.openstack.org.yaml @@ -348,3 +348,155 @@ 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' diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml index c89c3a1429..98b6791373 100644 --- a/nodepool/nl02.openstack.org.yaml +++ b/nodepool/nl02.openstack.org.yaml @@ -459,3 +459,155 @@ 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' diff --git a/tox.ini b/tox.ini index 74bac322ff..5008fbe568 100644 --- a/tox.ini +++ b/tox.ini @@ -101,10 +101,7 @@ changedir = {toxinidir}/nodepool commands = env ELEMENTS_DIR=elements dib-lint [testenv:nodepool] -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 +commands = nodepool -c {toxinidir}/nodepool/nodepool.yaml config-validate [testenv:add-projects-to-main] basepython = python3