2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a2fcb4655e0f/ Changeset: a2fcb4655e0f Branch: next-stable User: natefoo Date: 2013-08-02 22:39:05 Summary: Merge changes from stable. Affected #: 3 files diff -r 96eba6391a06e7e6230e06208347dfb51a64a1e1 -r a2fcb4655e0faa0bebb062a54cad05e448ed6c51 lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -264,6 +264,7 @@ self.datatypes_config = kwargs.get( 'datatypes_config_file', 'datatypes_conf.xml' ) # Cloud configuration options self.enable_cloud_launch = string_as_bool( kwargs.get( 'enable_cloud_launch', False ) ) + self.cloudlaunch_default_ami = kwargs.get( 'cloudlaunch_default_ami', 'ami-118bfc78' ) # Galaxy messaging (AMQP) configuration options self.amqp = {} try: diff -r 96eba6391a06e7e6230e06208347dfb51a64a1e1 -r a2fcb4655e0faa0bebb062a54cad05e448ed6c51 lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py --- a/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py +++ b/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py @@ -26,7 +26,6 @@ PKEY_PREFIX = 'gxy_pkey' DEFAULT_KEYPAIR = 'cloudman_keypair' -DEFAULT_AMI = 'ami-da58aab3' class CloudController(BaseUIController): @@ -96,7 +95,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, bucket_default=None, **kwargs): + def launch_instance(self, trans, cluster_name, password, key_id, secret, instance_type, share_string, keypair, ami=None, zone=None, bucket_default=None, **kwargs): ec2_error = None try: # Create security group & key pair used when starting an instance @@ -120,6 +119,9 @@ if bucket_default: user_provided_data['bucket_default'] = bucket_default + if not ami: + ami = trans.app.config.cloudlaunch_default_ami + rs = run_instance(ec2_conn=ec2_conn, image_id = ami, user_provided_data=user_provided_data, diff -r 96eba6391a06e7e6230e06208347dfb51a64a1e1 -r a2fcb4655e0faa0bebb062a54cad05e448ed6c51 universe_wsgi.ini.sample --- a/universe_wsgi.ini.sample +++ b/universe_wsgi.ini.sample @@ -324,9 +324,10 @@ # Note that this requires java > 1.4 for executing yuicompressor.jar #pack_scripts = False -# Enable Cloud Launch +# Cloud Launch #enable_cloud_launch = False +#cloudlaunch_default_ami = ami-118bfc78 # -- Advanced proxy features https://bitbucket.org/galaxy/galaxy-central/commits/436ca79f8211/ Changeset: 436ca79f8211 User: natefoo Date: 2013-08-02 22:39:52 Summary: Merge stable. Affected #: 3 files diff -r 57c593cc70a1de89f32e77833cbf1e329cf52c6b -r 436ca79f821132163526fa9bf1f7d6b7fe3f13c7 lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -264,6 +264,7 @@ self.datatypes_config = kwargs.get( 'datatypes_config_file', 'datatypes_conf.xml' ) # Cloud configuration options self.enable_cloud_launch = string_as_bool( kwargs.get( 'enable_cloud_launch', False ) ) + self.cloudlaunch_default_ami = kwargs.get( 'cloudlaunch_default_ami', 'ami-118bfc78' ) # Galaxy messaging (AMQP) configuration options self.amqp = {} try: diff -r 57c593cc70a1de89f32e77833cbf1e329cf52c6b -r 436ca79f821132163526fa9bf1f7d6b7fe3f13c7 lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py --- a/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py +++ b/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py @@ -26,7 +26,6 @@ PKEY_PREFIX = 'gxy_pkey' DEFAULT_KEYPAIR = 'cloudman_keypair' -DEFAULT_AMI = 'ami-da58aab3' class CloudController(BaseUIController): @@ -96,7 +95,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, bucket_default=None, **kwargs): + def launch_instance(self, trans, cluster_name, password, key_id, secret, instance_type, share_string, keypair, ami=None, zone=None, bucket_default=None, **kwargs): ec2_error = None try: # Create security group & key pair used when starting an instance @@ -120,6 +119,9 @@ if bucket_default: user_provided_data['bucket_default'] = bucket_default + if not ami: + ami = trans.app.config.cloudlaunch_default_ami + rs = run_instance(ec2_conn=ec2_conn, image_id = ami, user_provided_data=user_provided_data, diff -r 57c593cc70a1de89f32e77833cbf1e329cf52c6b -r 436ca79f821132163526fa9bf1f7d6b7fe3f13c7 universe_wsgi.ini.sample --- a/universe_wsgi.ini.sample +++ b/universe_wsgi.ini.sample @@ -324,9 +324,10 @@ # Note that this requires java > 1.4 for executing yuicompressor.jar #pack_scripts = False -# Enable Cloud Launch +# Cloud Launch #enable_cloud_launch = False +#cloudlaunch_default_ami = ami-118bfc78 # -- Advanced proxy features 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.