1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/fb28ce36133f/ Changeset: fb28ce36133f User: dannon Date: 2014-08-20 18:22:38 Summary: Update instance types, slim down the options to recommended types. This will (eventually) make it to a single shared resource in bioblend that's used in cloudman + galaxy, but this change gets us in sync for now. Affected #: 2 files
diff -r cb7713c693e73d90731489e267ca52a7b585d580 -r fb28ce36133ffcb6a167ba95003f4608b7574942 lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py --- a/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py +++ b/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py @@ -31,6 +31,14 @@ DEFAULT_KEYPAIR = 'cloudman_keypair' CLOUDMAN_TAG_KEY = 'galaxy:cloudman'
+DEFAULT_INSTANCE_TYPES = [ + ("c3.large", "Compute optimized Large (2 vCPU/4GB RAM)"), + ("c3.2xlarge", "Compute optimized 2xLarge (8 vCPU/15GB RAM)"), + ("c3.8xlarge", "Compute optimized 8xLarge (32 vCPU/60GB RAM)"), + ("r3.large", "Memory optimized Large (2 vCPU/15GB RAM)"), + ("r3.2xlarge", "Memory optimized 2xLarge (8 vCPU/61GB RAM)"), + ("r3.8xlarge", "Memory optimized 8xLarge (32 vCPU/244GB RAM)"), +]
class CloudController(BaseUIController): """Galaxy Cloud Functions""" @@ -47,7 +55,8 @@ default_keypair=DEFAULT_KEYPAIR, share_string=share_string, ami=ami, - bucket_default=bucket_default) + bucket_default=bucket_default, + instance_types = DEFAULT_INSTANCE_TYPES)
@web.expose def get_account_info(self, trans, key_id, secret):
diff -r cb7713c693e73d90731489e267ca52a7b585d580 -r fb28ce36133ffcb6a167ba95003f4608b7574942 templates/webapps/galaxy/cloud/index.mako --- a/templates/webapps/galaxy/cloud/index.mako +++ b/templates/webapps/galaxy/cloud/index.mako @@ -238,10 +238,9 @@ <div class="form-row"><label for="id_instance_type">Instance Type</label><select name="instance_type" id="id_instance_type"> - <option value="m1.large">Large</option> - <option value="m1.xlarge">Extra Large</option> - <option value="c3.2xlarge">Compute Optimized Double Extra Large</option> - <option value="m2.4xlarge">High-Memory Quadruple Extra Large</option> + %for (itype, description) in instance_types: + <option value="${itype}">${description}</option> + %endfor </select></div><div class="form-row">
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.