From f9d332f6c67f5e0cb70c1570499996926ffbdf5c Mon Sep 17 00:00:00 2001 From: spisarski Date: Thu, 16 Nov 2017 18:26:13 -0700 Subject: Refactoring of FlavorSettings to extend FlavorConfig FlavorSettings and glance_utils have a runtime cyclical dependency. This patch reduces this dependency and deprecates the FlavorSettings class. JIRA: SNAPS-216 Change-Id: Ie9532fcbe16377d4ab608bdacd1982c3c6628fe9 Signed-off-by: spisarski --- examples/launch.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'examples/launch.py') diff --git a/examples/launch.py b/examples/launch.py index debb52f..499d259 100644 --- a/examples/launch.py +++ b/examples/launch.py @@ -26,9 +26,10 @@ import os import yaml from snaps import file_utils -from snaps.openstack.create_flavor import FlavorSettings, OpenStackFlavor -from snaps.openstack.create_image import OpenStackImage +from snaps.config.flavor import FlavorConfig from snaps.config.image import ImageConfig +from snaps.openstack.create_flavor import OpenStackFlavor +from snaps.openstack.create_image import OpenStackImage from snaps.openstack.create_instance import VmInstanceSettings from snaps.openstack.create_keypairs import KeypairSettings, OpenStackKeypair from snaps.openstack.create_network import ( @@ -635,7 +636,7 @@ def main(arguments): # Create flavors flavors_dict = __create_instances( - os_creds_dict, OpenStackFlavor, FlavorSettings, + os_creds_dict, OpenStackFlavor, FlavorConfig, os_config.get('flavors'), 'flavor', clean, users_dict) creators.append(flavors_dict) -- cgit 1.2.3-korg