From 2a28bb03ee314c414a2211ae77cbdee1247ffd12 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Tue, 2 Feb 2021 10:30:31 -0500
Subject: [PATCH] Switch to using v3-standard-8 flavors

VEXXHOST no longer offers to flavors of instances, and it makes more
sense to use the standard flavors.  This flavor has 8 cores, 32GB
of memory and 160GB of disk space.  It doesn't make sense to have
a smaller memory/disk allocation as the hypervisors are ratio'd out
to work with this configuration.

Change-Id: Ie424e7d6236c00678d92b34ed33dafaf966180fa
---
 nodepool/nl03.openstack.org.yaml | 36 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/nodepool/nl03.openstack.org.yaml b/nodepool/nl03.openstack.org.yaml
index dbf97b7727..49c0130276 100644
--- a/nodepool/nl03.openstack.org.yaml
+++ b/nodepool/nl03.openstack.org.yaml
@@ -186,93 +186,93 @@ providers:
         labels:
           - name: centos-7
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: centos-7
             key-name: infra-root-keys-2020-05-13
           - name: centos-8
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: centos-8
             key-name: infra-root-keys-2020-05-13
           - name: centos-8-stream
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: centos-8-stream
             key-name: infra-root-keys-2020-05-13
           - name: debian-buster
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: debian-buster
             key-name: infra-root-keys-2020-05-13
           - name: debian-stretch
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: debian-stretch
             key-name: infra-root-keys-2020-05-13
           - name: fedora-31
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: fedora-31
             key-name: infra-root-keys-2020-05-13
           - name: fedora-32
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: fedora-32
             key-name: infra-root-keys-2020-05-13
           - name: gentoo-17-0-systemd
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: gentoo-17-0-systemd
             key-name: infra-root-keys-2020-05-13
           - name: opensuse-15
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: opensuse-15
             key-name: infra-root-keys-2020-05-13
           - name: opensuse-tumbleweed
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: opensuse-tumbleweed
             key-name: infra-root-keys-2020-05-13
           - name: ubuntu-bionic
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: ubuntu-bionic
             key-name: infra-root-keys-2020-05-13
           - name: ubuntu-focal
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: ubuntu-focal
             key-name: infra-root-keys-2020-05-13
           - name: ubuntu-xenial
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: ubuntu-xenial
             key-name: infra-root-keys-2020-05-13
           - name: nested-virt-ubuntu-bionic
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: ubuntu-bionic
             key-name: infra-root-keys-2020-05-13
           - name: nested-virt-ubuntu-focal
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: ubuntu-focal
             key-name: infra-root-keys-2020-05-13
           - name: nested-virt-centos-7
             min-ram: 8000
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: centos-7
             key-name: infra-root-keys-2020-05-13
       - name: vexxhost-specific
         max-servers: 20
         labels:
           - name: ubuntu-bionic-expanded-vexxhost
-            flavor-name: 'osf-standard-16'
+            flavor-name: 'v3-standard-16'
             diskimage: ubuntu-bionic
             key-name: infra-root-keys-2020-05-13
           - name: ubuntu-bionic-vexxhost
-            flavor-name: 'osf-highcpu-8'
+            flavor-name: 'v3-standard-8'
             diskimage: ubuntu-bionic
             key-name: infra-root-keys-2020-05-13
       - name: gpu