diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-07-16 16:18:20 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-07-16 19:52:14 +0100 |
commit | be8f8a740e769bdf70918d234f94338aea2d3430 (patch) | |
tree | bc5924923cfdef920922dd9b35f1b98ecf7dc2e6 | |
parent | e8adedb8f3f27d9212caf277b8e8f7c6792a20c2 (diff) | |
download | morph-baserock/pedroalvarez/os-improvement.tar.gz |
exts: Add more parameters to openstack.writebaserock/pedroalvarez/os-improvement
OS_IMAGE_URL and OS_AUTH_TOKEN are sometimes needed
to deploy images into OpenStack. This patch adds support
to use them if they are provided.
-rwxr-xr-x | morphlib/exts/openstack.write | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/morphlib/exts/openstack.write b/morphlib/exts/openstack.write index 8ee8767e..9693004a 100755 --- a/morphlib/exts/openstack.write +++ b/morphlib/exts/openstack.write @@ -126,12 +126,19 @@ class OpenStackWriteExtension(morphlib.writeexts.WriteExtension): '--os-username', username, '--os-tenant-name', tenant_name, '--os-password', password, - '--os-auth-url', auth_url, - 'image-create', - '--name=%s' % image_name, - '--disk-format=raw', - '--container-format', 'bare', - '--file', raw_disk] + '--os-auth-url', auth_url] + + if 'OPENSTACK_IMAGE_URL' in os.environ: + cmdline += ['--os-image-url', os.environ['OPENSTACK_IMAGE_URL']] + + if 'OPENSTACK_AUTH_TOKEN' in os.environ: + cmdline += ['--os-auth-token', os.environ['OPENSTACK_AUTH_TOKEN']] + + cmdline += ['image-create', + '--name=%s' % image_name, + '--disk-format=raw', + '--container-format', 'bare', + '--file', raw_disk] cliapp.runcmd(cmdline) self.status(msg='Image configured.') |