From 133b321125eeb4c22b2963dbd112a074cfeb6ab1 Mon Sep 17 00:00:00 2001 From: spisarski Date: Fri, 17 Nov 2017 09:25:33 -0700 Subject: Refactoring of UserSettings to extend UserConfig UserSettings and keystone_utils have a runtime cyclical dependency. This patch reduces this dependency and deprecates the UserSettings class. JIRA: SNAPS-226 Change-Id: Ifcc2a029463780e963b1afcf1de31baf9edded40 Signed-off-by: spisarski --- examples/launch.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'examples/launch.py') diff --git a/examples/launch.py b/examples/launch.py index d1129b0..0ed6456 100644 --- a/examples/launch.py +++ b/examples/launch.py @@ -30,6 +30,7 @@ from snaps.config.flavor import FlavorConfig from snaps.config.image import ImageConfig from snaps.config.keypair import KeypairConfig from snaps.config.project import ProjectConfig +from snaps.config.user import UserConfig from snaps.openstack.create_flavor import OpenStackFlavor from snaps.openstack.create_image import OpenStackImage from snaps.openstack.create_instance import VmInstanceSettings @@ -41,7 +42,7 @@ from snaps.openstack.create_qos import QoSSettings, OpenStackQoS from snaps.openstack.create_router import RouterSettings, OpenStackRouter from snaps.openstack.create_security_group import ( OpenStackSecurityGroup, SecurityGroupSettings) -from snaps.openstack.create_user import OpenStackUser, UserSettings +from snaps.openstack.create_user import OpenStackUser from snaps.openstack.create_volume import OpenStackVolume, VolumeSettings from snaps.openstack.create_volume_type import ( OpenStackVolumeType, VolumeTypeSettings) @@ -622,7 +623,7 @@ def main(arguments): # Create users users_dict = __create_instances( - os_creds_dict, OpenStackUser, UserSettings, + os_creds_dict, OpenStackUser, UserConfig, os_config.get('users'), 'user', clean) creators.append(users_dict) -- cgit 1.2.3-korg