Code Review
/
snaps.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Support both admin role name
[snaps.git]
/
snaps
/
openstack
/
create_image.py
diff --git
a/snaps/openstack/create_image.py
b/snaps/openstack/create_image.py
index
a5520e3
..
1a8aa12
100644
(file)
--- a/
snaps/openstack/create_image.py
+++ b/
snaps/openstack/create_image.py
@@
-54,7
+54,10
@@
class OpenStackImage(OpenStackCloudObject):
Loads the existing Image
:return: The Image domain object or None
"""
Loads the existing Image
:return: The Image domain object or None
"""
- self.__glance = glance_utils.glance_client(self._os_creds)
+ super(self.__class__, self).initialize()
+
+ self.__glance = glance_utils.glance_client(
+ self._os_creds, self._os_session)
self.__image = glance_utils.get_image(
self.__glance, image_settings=self.image_settings)
self.__image = glance_utils.get_image(
self.__glance, image_settings=self.image_settings)
@@
-145,6
+148,11
@@
class OpenStackImage(OpenStackCloudObject):
self.__kernel_image = None
self.__ramdisk_image = None
self.__kernel_image = None
self.__ramdisk_image = None
+ if self.__glance:
+ self.__glance.http_client.session.session.close()
+
+ super(self.__class__, self).clean()
+
def get_image(self):
"""
Returns the domain Image object as it was populated when create() was
def get_image(self):
"""
Returns the domain Image object as it was populated when create() was