summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorspisarski <s.pisarski@cablelabs.com>2017-11-17 14:05:29 -0700
committerspisarski <s.pisarski@cablelabs.com>2017-11-20 10:12:59 -0700
commit3c387ae1c18c4a80a752c3e5a2409f4a602b9e20 (patch)
tree87a80e4650f0587a3fcd55d5ad3ecc535ee09deb /examples
parent6dd10aa17c12bac0c3c185b15a444a5437563c14 (diff)
Refactoring of VolumeTypeSettings to extend VolumeTypeConfig
This also includes VolumeTypeEncryptionSettings extending to VolumeTypeEncryptionConfig which is a member of VolumeTypeConfig VolumeTypeSettings and cinder_utils have a runtime cyclical dependency. This patch reduces this dependency and deprecates the VolumeTypeSettings class. JIRA: SNAPS-228 Change-Id: Iaa9c7a1cd810cf63d1badb00f71bcdcefb527e12 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/launch.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/launch.py b/examples/launch.py
index b0e87ba..35ebaf7 100644
--- a/examples/launch.py
+++ b/examples/launch.py
@@ -26,6 +26,7 @@ import os
import yaml
from snaps import file_utils
+from snaps.config.volume_type import VolumeTypeConfig
from snaps.config.flavor import FlavorConfig
from snaps.config.image import ImageConfig
from snaps.config.keypair import KeypairConfig
@@ -46,8 +47,7 @@ from snaps.openstack.create_security_group import (
OpenStackSecurityGroup, SecurityGroupSettings)
from snaps.openstack.create_user import OpenStackUser
from snaps.openstack.create_volume import OpenStackVolume, VolumeSettings
-from snaps.openstack.create_volume_type import (
- OpenStackVolumeType, VolumeTypeSettings)
+from snaps.openstack.create_volume_type import OpenStackVolumeType
from snaps.openstack.os_credentials import OSCreds, ProxySettings
from snaps.openstack.utils import deploy_utils
from snaps.provisioning import ansible_utils
@@ -653,7 +653,7 @@ def main(arguments):
# Create volume types
vol_type_dict = __create_instances(
- os_creds_dict, OpenStackVolumeType, VolumeTypeSettings,
+ os_creds_dict, OpenStackVolumeType, VolumeTypeConfig,
os_config.get('volume_types'), 'volume_type', clean,
users_dict)
creators.append(vol_type_dict)