From 8d86f7184f124be5ff284a1dfcd4cc757f5d30dc Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 27 Feb 2018 04:39:42 -0500 Subject: [PATCH] Add ubuntu-bionic to nodepool As ubuntu-bionic is the new LTS for ubuntu, start providing images in nodepool. Something to note, bionic isn't actually released yet. However our tooling does work and is able to create workable images. We should hold off to migrating jobs from ubuntu-xenial to ubuntu-bionic until it is officially released, and we have a migration plan in place. Change-Id: If12435969ca37400bfd04abe8470048146be7aa3 Signed-off-by: Paul Belanger --- nodepool/nl01.openstack.org.yaml | 10 ++++++++++ nodepool/nl02.openstack.org.yaml | 9 +++++++++ nodepool/nl03.openstack.org.yaml | 14 ++++++++++++++ nodepool/nl04.openstack.org.yaml | 9 +++++++++ nodepool/nodepool.yaml | 22 ++++++++++++++++++++++ 5 files changed, 64 insertions(+) diff --git a/nodepool/nl01.openstack.org.yaml b/nodepool/nl01.openstack.org.yaml index bd96b578f4..886ba24615 100644 --- a/nodepool/nl01.openstack.org.yaml +++ b/nodepool/nl01.openstack.org.yaml @@ -21,6 +21,8 @@ labels: min-ready: 1 - name: opensuse-tumbleweed min-ready: 1 + - name: ubuntu-bionic + min-ready: 1 - name: ubuntu-trusty min-ready: 1 - name: ubuntu-xenial @@ -46,6 +48,8 @@ providers: config-drive: true - name: opensuse-tumbleweed config-drive: true + - name: ubuntu-bionic + config-drive: true - name: ubuntu-trusty config-drive: true - name: ubuntu-xenial @@ -84,6 +88,11 @@ providers: flavor-name: 'Performance' diskimage: opensuse-tumbleweed key-name: infra-root-keys + - name: ubuntu-bionic + min-ram: 8192 + flavor-name: 'Performance' + diskimage: ubuntu-bionic + key-name: infra-root-keys - name: ubuntu-trusty min-ram: 8192 flavor-name: 'Performance' @@ -128,5 +137,6 @@ diskimages: - name: gentoo - name: opensuse-423 - name: opensuse-tumbleweed + - name: ubuntu-bionic - name: ubuntu-trusty - name: ubuntu-xenial diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml index e12a11b180..b92ebcd5fa 100644 --- a/nodepool/nl02.openstack.org.yaml +++ b/nodepool/nl02.openstack.org.yaml @@ -15,6 +15,7 @@ labels: - name: fedora-27 - name: opensuse-423 - name: opensuse-tumbleweed + - name: ubuntu-bionic - name: ubuntu-trusty - name: ubuntu-xenial @@ -39,6 +40,8 @@ providers: config-drive: true - name: opensuse-tumbleweed config-drive: true + - name: ubuntu-bionic + config-drive: true - name: ubuntu-trusty config-drive: true - name: ubuntu-xenial @@ -81,6 +84,11 @@ providers: flavor-name: '8C-8GB-100GB' diskimage: opensuse-tumbleweed key-name: infra-root-keys + - name: ubuntu-bionic + min-ram: 8000 + flavor-name: '8C-8GB-100GB' + diskimage: ubuntu-bionic + key-name: infra-root-keys - name: ubuntu-trusty min-ram: 8000 flavor-name: '8C-8GB-100GB' @@ -151,5 +159,6 @@ diskimages: - name: gentoo - name: opensuse-423 - name: opensuse-tumbleweed + - name: ubuntu-bionic - name: ubuntu-trusty - name: ubuntu-xenial diff --git a/nodepool/nl03.openstack.org.yaml b/nodepool/nl03.openstack.org.yaml index c99e5ca322..cd29c63918 100644 --- a/nodepool/nl03.openstack.org.yaml +++ b/nodepool/nl03.openstack.org.yaml @@ -18,6 +18,7 @@ labels: - name: fedora-27 - name: opensuse-423 - name: opensuse-tumbleweed + - name: ubuntu-bionic - name: ubuntu-trusty - name: ubuntu-xenial - name: ubuntu-xenial-arm64 @@ -43,6 +44,8 @@ providers: config-drive: true - name: opensuse-tumbleweed config-drive: true + - name: ubuntu-bionic + config-drive: true - name: ubuntu-trusty config-drive: true - name: ubuntu-xenial @@ -81,6 +84,11 @@ providers: flavor-name: 'A1.8' diskimage: opensuse-tumbleweed key-name: infra-root-keys + - name: ubuntu-bionic + min-ram: 8000 + flavor-name: 'A1.8' + diskimage: ubuntu-bionic + key-name: infra-root-keys - name: ubuntu-trusty min-ram: 8000 flavor-name: 'A1.8' @@ -132,6 +140,11 @@ providers: flavor-name: 'v1-standard-8' diskimage: opensuse-tumbleweed key-name: infra-root-keys + - name: ubuntu-bionic + min-ram: 8000 + flavor-name: 'v1-standard-8' + diskimage: ubuntu-bionic + key-name: infra-root-keys - name: ubuntu-trusty min-ram: 8000 flavor-name: 'v1-standard-8' @@ -170,6 +183,7 @@ diskimages: - name: gentoo - name: opensuse-423 - name: opensuse-tumbleweed + - name: ubuntu-bionic - name: ubuntu-trusty - name: ubuntu-xenial - name: ubuntu-xenial-arm64 diff --git a/nodepool/nl04.openstack.org.yaml b/nodepool/nl04.openstack.org.yaml index 0c001d00a5..9fca274a21 100644 --- a/nodepool/nl04.openstack.org.yaml +++ b/nodepool/nl04.openstack.org.yaml @@ -15,6 +15,7 @@ labels: - name: fedora-27 - name: opensuse-423 - name: opensuse-tumbleweed + - name: ubuntu-bionic - name: ubuntu-trusty - name: ubuntu-xenial @@ -37,6 +38,8 @@ providers: config-drive: true - name: opensuse-tumbleweed config-drive: true + - name: ubuntu-bionic + config-drive: true - name: ubuntu-trusty config-drive: true - name: ubuntu-xenial @@ -75,6 +78,11 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: opensuse-tumbleweed key-name: infra-root-keys + - name: ubuntu-bionic + min-ram: 8000 + flavor-name: ssd-osFoundation-3 + diskimage: ubuntu-bionic + key-name: infra-root-keys - name: ubuntu-trusty min-ram: 8000 flavor-name: ssd-osFoundation-3 @@ -105,5 +113,6 @@ diskimages: - name: gentoo - name: opensuse-423 - name: opensuse-tumbleweed + - name: ubuntu-bionic - name: ubuntu-trusty - name: ubuntu-xenial diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 0aa09fdbb6..8c4a5c1892 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -49,6 +49,8 @@ providers: config-drive: true - name: opensuse-tumbleweed config-drive: true + - name: ubuntu-bionic + config-drive: true - name: ubuntu-trusty config-drive: true - name: ubuntu-xenial @@ -218,6 +220,26 @@ diskimages: DIB_IMAGE_CACHE: /opt/dib_cache QEMU_IMG_OPTIONS: compat=0.10 DIB_GRUB_TIMEOUT: '0' + - name: ubuntu-bionic + elements: + - ubuntu-minimal + - vm + - simple-init + - openstack-repos + - nodepool-base + - cache-devstack + - growroot + - infra-package-needs + release: bionic + 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' + # TODO(pabelanger): Add AFS mirrors once bionic-updates is created. + DIB_DEBIAN_COMPONENTS: 'main,universe' - name: ubuntu-trusty elements: - ubuntu-minimal