diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-05 14:50:31 +0100 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-05 14:51:12 +0100 |
commit | ba7d1d1ed3bad002ce36e5d4adf4e3794625091a (patch) | |
tree | cb122e0a819e2e9aa593ae0d8110529304479d51 /morphlib/exts/openstack.write | |
parent | aea1029044b7e0d4578f3896bf85898f33791c89 (diff) | |
download | morph-ba7d1d1ed3bad002ce36e5d4adf4e3794625091a.tar.gz |
Check OpenStack credentials in openstack.checkbaserock/pedroalvarez/openstack-check-improvements
If the credentials are wrong, then morph will fail before
attempting the OpenStack deployment.
To achieve that openstack.check will attempt to run
`glance image-list`.
Diffstat (limited to 'morphlib/exts/openstack.write')
-rwxr-xr-x | morphlib/exts/openstack.write | 14 |
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...') |