diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-05-04 12:43:53 -0600 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-05-08 09:31:16 -0600 |
| commit | d1c4675e5c35257b84cd69969c6e67575faf19db (patch) | |
| tree | 63ff3b41ff445b8c192ec33c0aefb913a112b613 /snaps/openstack/utils/glance_utils.py | |
| parent | 40c96233ca4c27de1b3d8b53187c302ddd6208a2 (diff) | |
Modified code to support both Python 2.7 and 3.x
* Tested on Python 2.7.10 and 3.4.4
* Updated installation documentation
JIRA: SNAPS-30
Change-Id: I94a37d218be8ea47bbbcfb560197737430fcb3ba
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/utils/glance_utils.py')
| -rw-r--r-- | snaps/openstack/utils/glance_utils.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/snaps/openstack/utils/glance_utils.py b/snaps/openstack/utils/glance_utils.py index d859257..ca9c490 100644 --- a/snaps/openstack/utils/glance_utils.py +++ b/snaps/openstack/utils/glance_utils.py @@ -151,10 +151,8 @@ def __create_image_v2(glance, image_settings): kwargs['name'] = image_settings.name kwargs['disk_format'] = image_settings.format kwargs['container_format'] = 'bare' - if image_settings.extra_properties: - for key, value in image_settings.extra_properties.iteritems(): - kwargs[key] = value + kwargs.update(image_settings.extra_properties) created_image = glance.images.create(**kwargs) image_file = file_utils.get_file(image_filename) |