From 3837b1ac85f4852c5314ab23e0180725a3e22c96 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Fri, 5 Jun 2020 15:54:33 +0000
Subject: [PATCH] Drop add_tempest_flavors in favor of using
 nova.setup.create_flavors

---
 zaza/openstack/charm_tests/nova/utils.py    | 10 ++++++++
 zaza/openstack/charm_tests/tempest/setup.py | 27 ---------------------
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/zaza/openstack/charm_tests/nova/utils.py b/zaza/openstack/charm_tests/nova/utils.py
index 974edd7..f2fcefc 100644
--- a/zaza/openstack/charm_tests/nova/utils.py
+++ b/zaza/openstack/charm_tests/nova/utils.py
@@ -35,5 +35,15 @@ FLAVORS = {
         'ram': 8192,
         'disk': 40,
         'vcpus': 4},
+    'm1.tempest': {
+        'flavorid': 5,
+        'ram': 256,
+        'disk': 1,
+        'vcpus': 1},
+    'm2.tempest': {
+        'flavorid': 6,
+        'ram': 512,
+        'disk': 1,
+        'vcpus': 1},
 }
 KEYPAIR_NAME = 'zaza'
diff --git a/zaza/openstack/charm_tests/tempest/setup.py b/zaza/openstack/charm_tests/tempest/setup.py
index 0e90597..f93b3d3 100644
--- a/zaza/openstack/charm_tests/tempest/setup.py
+++ b/zaza/openstack/charm_tests/tempest/setup.py
@@ -295,33 +295,6 @@ def render_tempest_config_keystone_v3():
     setup_tempest(tempest_v3, accounts)
 
 
-def add_tempest_flavors():
-    """Add tempest flavors to overcloud.
-
-    :returns: None
-    :rtype: None
-    """
-    keystone_session = openstack_utils.get_overcloud_keystone_session()
-    nova_client = openstack_utils.get_nova_session_client(
-        keystone_session)
-    try:
-        nova_client.flavors.create(
-            name=TEMPEST_FLAVOR_NAME,
-            ram=256,
-            vcpus=1,
-            disk=1)
-    except novaclient.exceptions.Conflict:
-        pass
-    try:
-        nova_client.flavors.create(
-            name=TEMPEST_ALT_FLAVOR_NAME,
-            ram=512,
-            vcpus=1,
-            disk=1)
-    except novaclient.exceptions.Conflict:
-        pass
-
-
 def add_tempest_roles():
     """Add tempest roles overcloud.