Permalink
Browse files

updating to the latest boto

  • Loading branch information...
1 parent d7b8773 commit 81479cd0048d64261d22e09ebaa6564854b09477 @buzztroll buzztroll committed Oct 3, 2012
Showing with 6 additions and 5 deletions.
  1. +3 −3 phantomweb/workload.py
  2. +2 −1 setup.cfg
  3. +1 −1 setup.py
View
@@ -21,15 +21,15 @@ def _get_phantom_con(userobj):
uparts = urlparse.urlparse(url)
is_secure = uparts.scheme == 'https'
region = RegionInfo(uparts.hostname)
- con = boto.ec2.autoscale.AutoScaleConnection(aws_access_key_id=userobj._user_dbobject.access_key, aws_secret_access_key=userobj._user_dbobject.access_secret, is_secure=is_secure, port=uparts.port, region=region)
+ con = boto.ec2.autoscale.AutoScaleConnection(aws_access_key_id=userobj._user_dbobject.access_key, aws_secret_access_key=userobj._user_dbobject.access_secret, is_secure=is_secure, port=uparts.port, region=region, validate_certs=False)
con.host = uparts.hostname
return con
@LogEntryDecorator
def _get_iaas_compute_con(iaas_cloud):
uparts = urlparse.urlparse(iaas_cloud.cloud_url)
is_secure = uparts.scheme == 'https'
- ec2conn = EC2Connection(iaas_cloud.iaas_key, iaas_cloud.iaas_secret, host=uparts.hostname, port=uparts.port, is_secure=is_secure)
+ ec2conn = EC2Connection(iaas_cloud.iaas_key, iaas_cloud.iaas_secret, host=uparts.hostname, port=uparts.port, is_secure=is_secure, validate_certs=False)
ec2conn.host = uparts.hostname
return ec2conn
@@ -171,7 +171,7 @@ def start_domain(request_params, userobj):
lc_name = "%s@%s" % (lc_name, cloud)
lc = _find_or_create_config(con, size, image_name, key_name, common, lc_name, user_data)
- asg = boto.ec2.autoscale.group.AutoScalingGroup(launch_config=lc, connection=con, group_name=asg_name, availability_zones=[cloud], min_size=desired_size, max_size=desired_size)
+ asg = boto.ec2.autoscale.group.AutoScalingGroup(launch_config=lc, connection=con, group_name=asg_name, availability_zones=[cloud], min_size=desired_size, max_size=desired_size, validate_certs=False)
con.create_auto_scaling_group(asg)
response_dict = {
'Success': True,
View
@@ -1,3 +1,4 @@
[easy_install]
-find_links = http://github.com/nimbusproject/PhantomSQL/tarball/master#egg=phantomsql-0.1
+find_links = http://github.com/nimbusproject/PhantomSQL/tarball/phantom0.2#egg=phantomsql-0.1
+ http://github.com/buzztroll/boto/tarball/non_aws_asg_connection#egg=boto-2.6
View
@@ -23,7 +23,7 @@
packages=['phantomweb'],
include_package_data=True,
package_data={ 'phantomweb': ['templates/registration/*.html', 'templates/*.html', 'static/css/*', 'static/js/*', 'static/images/*'] },
- install_requires = ["django == 1.4", "boto == 2.0", "phantomsql"],
+ install_requires = ["django == 1.4", "boto == 2.6", "phantomsql"],
classifiers=[
'Development Status :: 4 - Beta',

0 comments on commit 81479cd

Please sign in to comment.