Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'develop' of https://github.com/jreese/boto into jreese-…

…develop
  • Loading branch information...
commit a24423a2c8350da527e7dfe9fcf7371b11600357 2 parents 199de49 + 1f11d43
Mitch Garnaat garnaat authored
Showing with 6 additions and 4 deletions.
  1. +6 −4 boto/ec2/elb/__init__.py
10 boto/ec2/elb/__init__.py
View
@@ -157,10 +157,11 @@ def create_load_balancer(self, name, zones, listeners, subnets=None,
params = {'LoadBalancerName' : name}
for index, listener in enumerate(listeners):
i = index + 1
+ protocol = listener[2].upper()
params['Listeners.member.%d.LoadBalancerPort' % i] = listener[0]
params['Listeners.member.%d.InstancePort' % i] = listener[1]
- params['Listeners.member.%d.Protocol' % i] = listener[2]
- if listener[2]=='HTTPS':
+ params['Listeners.member.%d.Protocol' % i] = protocol
+ if protocol == 'HTTPS' or protocol == 'SSL':
params['Listeners.member.%d.SSLCertificateId' % i] = listener[3]
if zones:
self.build_list_params(params, zones, 'AvailabilityZones.member.%d')
@@ -203,10 +204,11 @@ def create_load_balancer_listeners(self, name, listeners):
params = {'LoadBalancerName' : name}
for index, listener in enumerate(listeners):
i = index + 1
+ protocol = listener[2].upper()
params['Listeners.member.%d.LoadBalancerPort' % i] = listener[0]
params['Listeners.member.%d.InstancePort' % i] = listener[1]
- params['Listeners.member.%d.Protocol' % i] = listener[2]
- if listener[2] == 'HTTPS' or listener[2] == 'SSL':
+ params['Listeners.member.%d.Protocol' % i] = protocol
+ if protocol == 'HTTPS' or protocol == 'SSL':
params['Listeners.member.%d.SSLCertificateId' % i] = listener[3]
return self.get_status('CreateLoadBalancerListeners', params)
Please sign in to comment.
Something went wrong with that request. Please try again.