From 44af711f9097f2737ab8388da22ddd0615616868 Mon Sep 17 00:00:00 2001 From: Blake Gentry Date: Fri, 15 Jul 2011 11:07:52 -0700 Subject: [PATCH] [AWS|ELB] offload Listener defaults to the Listener model --- lib/fog/aws/models/elb/load_balancer.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/fog/aws/models/elb/load_balancer.rb b/lib/fog/aws/models/elb/load_balancer.rb index 5898420e5..4181cd588 100644 --- a/lib/fog/aws/models/elb/load_balancer.rb +++ b/lib/fog/aws/models/elb/load_balancer.rb @@ -15,10 +15,13 @@ module Fog def initialize(attributes={}) attributes[:availability_zones] ||= attributes['AvailabilityZones'] || %w(us-east-1a us-east-1b us-east-1c us-east-1d) - attributes['ListenerDescriptions'] ||= [{ - 'Listener' => {'LoadBalancerPort' => 80, 'InstancePort' => 80, 'Protocol' => 'HTTP'}, - 'PolicyNames' => [] - }] + unless attributes['ListenerDescriptions'] + new_listener = Fog::AWS::ELB::Listener.new + attributes['ListenerDescriptions'] = [{ + 'Listener' => new_listener.to_params, + 'PolicyNames' => new_listener.policy_names + }] + end attributes['Policies'] ||= {'AppCookieStickinessPolicies' => [], 'LBCookieStickinessPolicies' => []} super end