From 3f14650bead55e2c2d3f732d7b91571de9d1f649 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 4 Feb 2020 08:54:40 -0800 Subject: [PATCH] Start using airship citycloud cloud It appears that the cloud launcher has configured networking on this cloud. Next step is to uplaod images and plan out labels. We'll start at max-servers 0 in order to get images uploaded. Then work with cloud provider and airship to sort out quotas and max-servers values from there. Change-Id: Ic2f8acb64dc23c238676729839f55d7b592e0d15 --- nodepool/nl02.openstack.org.yaml | 79 ++++++++++++++++++++++++++++++++ nodepool/nodepool.yaml | 6 +++ 2 files changed, 85 insertions(+) diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml index b067402f1b..939dec8b59 100644 --- a/nodepool/nl02.openstack.org.yaml +++ b/nodepool/nl02.openstack.org.yaml @@ -363,6 +363,85 @@ providers: diskimage: centos-7 key-name: infra-root-keys-2018-06-15 + - name: airship-kna1 + region-name: 'Kna1' + cloud: airship-citycloud + boot-timeout: 120 + launch-timeout: 600 + clean-floating-ips: true + rate: 0.25 + diskimages: *provider_diskimages + pools: + - name: main + max-servers: 0 + labels: + - name: centos-7 + min-ram: 8000 + flavor-name: '8C-8GB-100GB' + diskimage: centos-7 + key-name: infra-root-keys-2018-06-15 + - name: centos-8 + min-ram: 8000 + flavor-name: '8C-8GB-100GB' + diskimage: centos-8 + key-name: infra-root-keys-2018-06-15 + - name: debian-buster + min-ram: 8000 + flavor-name: '8C-8GB-100GB' + diskimage: debian-buster + key-name: infra-root-keys-2018-06-15 + - name: debian-stretch + min-ram: 8000 + flavor-name: '8C-8GB-100GB' + diskimage: debian-stretch + key-name: infra-root-keys-2018-06-15 + - name: fedora-29 + min-ram: 8000 + flavor-name: '8C-8GB-100GB' + diskimage: fedora-29 + key-name: infra-root-keys-2018-06-15 + - name: fedora-30 + min-ram: 8000 + flavor-name: '8C-8GB-100GB' + diskimage: fedora-30 + key-name: infra-root-keys-2018-06-15 + - name: gentoo-17-0-systemd + min-ram: 8000 + flavor-name: '8C-8GB-100GB' + diskimage: gentoo-17-0-systemd + key-name: infra-root-keys-2018-06-15 + - name: opensuse-15 + min-ram: 8000 + flavor-name: '8C-8GB-100GB' + diskimage: opensuse-15 + key-name: infra-root-keys-2018-06-15 + - name: opensuse-tumbleweed + min-ram: 8000 + flavor-name: '8C-8GB-100GB' + diskimage: opensuse-tumbleweed + key-name: infra-root-keys-2018-06-15 + - name: ubuntu-bionic + min-ram: 8000 + flavor-name: '8C-8GB-100GB' + diskimage: ubuntu-bionic + key-name: infra-root-keys-2018-06-15 + - name: ubuntu-xenial + min-ram: 8000 + flavor-name: '8C-8GB-100GB' + diskimage: ubuntu-xenial + key-name: infra-root-keys-2018-06-15 + # TODO add nested virt labels once confirmed nested virt works + # to some degree. + - name: airship + max-servers: 0 + labels: + # TODO figure out what flavors are needed here + - name: ubuntu-bionic-expanded + min-ram: 16000 + flavor-name: '8C-16GB-100GB' + diskimage: ubuntu-bionic + key-name: infra-root-keys-2018-06-15 + diskimages: - name: centos-7 - name: centos-8 diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index ee81124271..ccc613f213 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -112,6 +112,12 @@ providers: rate: 0.001 diskimages: *provider_diskimages + - name: airship-kna1 + region-name: 'Kna1' + cloud: airship-citycloud + rate: 0.25 + diskimages: *provider_diskimages + diskimages: - name: centos-7 pause: false