Merge branch 'baserock/pedroalvarez/openstack-exts-fixups'

Reviewed-by: Daniel Silverstone
Reviewed-by: Lars Wirzenius

2 files changed, 2 insertions, 3 deletions

diff --git a/morphlib/exts/openstack.check b/morphlib/exts/openstack.check
index d9d3ef24..edc37cc1 100755
--- a/morphlib/exts/openstack.check
+++ b/morphlib/exts/openstack.check
@@ -60,7 +60,7 @@ class OpenStackCheckExtension(morphlib.writeexts.WriteExtension):
     def check_location(self, location):
         x = urlparse.urlparse(location)
         if x.scheme not in ['http', 'https']:
-            raise cliapp.AppException('URL schema must be http or https in %s' \
+            raise cliapp.AppException('URL schema must be http or https in %s'\
                                       % location)
         if (x.path != '/v2.0' and x.path != '/v2.0/'):
             raise cliapp.AppException('API version must be v2.0 in %s'\
diff --git a/morphlib/exts/openstack.write b/morphlib/exts/openstack.write
index ac2e2c8a..516fe367 100755
--- a/morphlib/exts/openstack.write
+++ b/morphlib/exts/openstack.write
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright (C) 2013  Codethink Limited
+# Copyright (C) 2013 - 2014 Codethink Limited
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -63,7 +63,6 @@ class OpenStackWriteExtension(morphlib.writeexts.WriteExtension):
             raise cliapp.AppException('Wrong number of command line args')
         
         temp_root, location = args
-        self.check_location(location)
 
         os_params = self.get_openstack_parameters()