diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-11-16 16:07:47 -0700 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-11-16 16:07:47 -0700 |
| commit | 4cad4f7d1f53189900f9024fa5478e98a64d3760 (patch) | |
| tree | a7a7161386d67b6a0214d7f802a5132b58ad2e71 /examples | |
| parent | 792a01b6592b320b80bdc7465247b0fcb19f1264 (diff) | |
Refactoring of ImageSettings to extend ImageConfig
ImageSettings and glance_utils have a runtime cyclical
dependency. This patch reduces this dependency and
deprecates the ImageSettings class.
JIRA: SNAPS-217
Change-Id: I09f34531366f2a5bd3202c9cbbdef878b2542abe
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/demo.py | 7 | ||||
| -rw-r--r-- | examples/launch.py | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/examples/demo.py b/examples/demo.py index 108bdc0..faf6459 100644 --- a/examples/demo.py +++ b/examples/demo.py @@ -13,10 +13,11 @@ os_creds = OSCreds(username='admin', password='cable123', auth_url='http://192.1 # Images -from snaps.openstack.create_image import ImageSettings, OpenStackImage +from snaps.openstack.create_image import OpenStackImage +from snaps.config.image import ImageConfig -image_settings = ImageSettings(name='cirros-test', image_user='cirros', img_format='qcow2', - url='http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img') +image_settings = ImageConfig(name='cirros-test', image_user='cirros', img_format='qcow2', + url='http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img') image = OpenStackImage(os_creds, image_settings) image.create() diff --git a/examples/launch.py b/examples/launch.py index 88ff420..debb52f 100644 --- a/examples/launch.py +++ b/examples/launch.py @@ -27,7 +27,8 @@ import yaml from snaps import file_utils from snaps.openstack.create_flavor import FlavorSettings, OpenStackFlavor -from snaps.openstack.create_image import ImageSettings, OpenStackImage +from snaps.openstack.create_image import OpenStackImage +from snaps.config.image import ImageConfig from snaps.openstack.create_instance import VmInstanceSettings from snaps.openstack.create_keypairs import KeypairSettings, OpenStackKeypair from snaps.openstack.create_network import ( @@ -659,7 +660,7 @@ def main(arguments): # Create images images_dict = __create_instances( - os_creds_dict, OpenStackImage, ImageSettings, + os_creds_dict, OpenStackImage, ImageConfig, os_config.get('images'), 'image', clean, users_dict) creators.append(images_dict) |