1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/2e324d02a963/
Changeset: 2e324d02a963
User: dannon
Date: 2013-05-31 17:55:46
Summary: Add bucket_default userData (param-based only) to cloudlaunch.
Affected #: 2 files
diff -r b27fc53fd92f7c306530fd878177c403dd3b1882 -r
2e324d02a9633e9b7e0ee5d6535e76afef57d934
lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py
--- a/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py
+++ b/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py
@@ -35,8 +35,12 @@
BaseUIController.__init__(self, app)
@web.expose
- def index(self, trans, share_string=None, ami=None):
- return trans.fill_template("cloud/index.mako", default_keypair =
DEFAULT_KEYPAIR, share_string=share_string, ami=ami)
+ def index(self, trans, share_string=None, ami=None, bucket_default = None):
+ return trans.fill_template("cloud/index.mako",
+ default_keypair = DEFAULT_KEYPAIR,
+ share_string=share_string,
+ ami=ami,
+ bucket_default=bucket_default)
@web.expose
def get_account_info(self, trans, key_id, secret, **kwargs):
@@ -92,7 +96,7 @@
return to_json_string(account_info)
@web.expose
- def launch_instance(self, trans, cluster_name, password, key_id, secret,
instance_type, share_string, keypair, ami=DEFAULT_AMI, zone=None, **kwargs):
+ def launch_instance(self, trans, cluster_name, password, key_id, secret,
instance_type, share_string, keypair, ami=DEFAULT_AMI, zone=None, bucket_default=None,
**kwargs):
ec2_error = None
try:
# Create security group & key pair used when starting an instance
@@ -113,6 +117,8 @@
user_provided_data['password'] = password
if share_string:
user_provided_data['share_string'] = share_string
+ if bucket_default:
+ user_provided_data['bucket_default'] = bucket_default
rs = run_instance(ec2_conn=ec2_conn,
image_id = ami,
diff -r b27fc53fd92f7c306530fd878177c403dd3b1882 -r
2e324d02a9633e9b7e0ee5d6535e76afef57d934 templates/webapps/galaxy/cloud/index.mako
--- a/templates/webapps/galaxy/cloud/index.mako
+++ b/templates/webapps/galaxy/cloud/index.mako
@@ -250,6 +250,10 @@
<input type='hidden' name='ami'
value='${ami}'/>
%endif
+ %if bucket_default:
+ <input type='hidden' name='bucket_default'
value='${bucket_default}'/>
+ %endif
+
<div class="form-row"><label
for="id_instance_type">Instance Type</label><select
name="instance_type" id="id_instance_type">
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.