summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorspisarski <s.pisarski@cablelabs.com>2017-11-17 08:35:45 -0700
committerspisarski <s.pisarski@cablelabs.com>2017-11-20 07:43:34 -0700
commit88c180252d78226e06ecf53a23d4f0eca9815bb8 (patch)
treed448f86a7c3f15cc5d255054465ff9b1f67967c6 /examples
parentf9d332f6c67f5e0cb70c1570499996926ffbdf5c (diff)
Refactoring of KeypairSettings to extend KeypairConfig
KeypairSettings and glance_utils have a runtime cyclical dependency. This patch reduces this dependency and deprecates the KeypairSettings class. JIRA: SNAPS-219 Change-Id: I92f51ecb77238444697e922c8f089e78d1c643aa Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/launch.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/launch.py b/examples/launch.py
index 499d259..4d2a69f 100644
--- a/examples/launch.py
+++ b/examples/launch.py
@@ -28,10 +28,11 @@ import yaml
from snaps import file_utils
from snaps.config.flavor import FlavorConfig
from snaps.config.image import ImageConfig
+from snaps.config.keypair import KeypairConfig
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_keypairs import OpenStackKeypair
from snaps.openstack.create_network import (
PortSettings, NetworkSettings, OpenStackNetwork)
from snaps.openstack.create_project import OpenStackProject, ProjectSettings
@@ -677,7 +678,7 @@ def main(arguments):
# Create keypairs
keypairs_dict = __create_instances(
- os_creds_dict, OpenStackKeypair, KeypairSettings,
+ os_creds_dict, OpenStackKeypair, KeypairConfig,
os_config.get('keypairs'), 'keypair', clean, users_dict)
creators.append(keypairs_dict)