summaryrefslogtreecommitdiff
path: root/morphlib/exts/openstack.write
diff options
context:
space:
mode:
Diffstat (limited to 'morphlib/exts/openstack.write')
-rwxr-xr-xmorphlib/exts/openstack.write14
1 files changed, 1 insertions, 13 deletions
diff --git a/morphlib/exts/openstack.write b/morphlib/exts/openstack.write
index 8ee8767e..ac2e2c8a 100755
--- a/morphlib/exts/openstack.write
+++ b/morphlib/exts/openstack.write
@@ -96,27 +96,15 @@ class OpenStackWriteExtension(morphlib.writeexts.WriteExtension):
self.unmount(mp)
def get_openstack_parameters(self):
- '''Check the environment variables needed and returns all.
+ '''Get the environment variables needed.
The environment variables are described in the class documentation.
'''
keys = ('OPENSTACK_USER', 'OPENSTACK_TENANT',
'OPENSTACK_IMAGENAME', 'OPENSTACK_PASSWORD')
- for key in keys:
- if key not in os.environ:
- raise cliapp.AppException(key + ' was not given')
return (os.environ[key] for key in keys)
- def check_location(self, location):
- x = urlparse.urlparse(location)
- if x.scheme != 'http':
- raise cliapp.AppException('URL schema must be http in %s' \
- % location)
- if (x.path != '/v2.0' and x.path != '/v2.0/'):
- raise cliapp.AppException('API version must be v2.0 in %s'\
- % location)
-
def configure_openstack_image(self, raw_disk, auth_url, os_params):
'''Configure the image in OpenStack using glance-client'''
self.status(msg='Configuring OpenStack image...')