diff --git a/lib/fog/zerigo/models/dns/record.rb b/lib/fog/zerigo/models/dns/record.rb index b60a0f3de..8223714db 100644 --- a/lib/fog/zerigo/models/dns/record.rb +++ b/lib/fog/zerigo/models/dns/record.rb @@ -23,7 +23,6 @@ module Fog attribute :zone_id, :aliases => 'zone-id' def initialize(attributes={}) - self.ttl ||= 3600 super end diff --git a/lib/fog/zerigo/models/dns/zone.rb b/lib/fog/zerigo/models/dns/zone.rb index dbed9ece8..70fda422e 100644 --- a/lib/fog/zerigo/models/dns/zone.rb +++ b/lib/fog/zerigo/models/dns/zone.rb @@ -27,7 +27,6 @@ module Fog def initialize(attributes={}) self.type ||= 'pri_sec' - self.ttl ||= 3600 super end diff --git a/tests/dns/models/record_tests.rb b/tests/dns/models/record_tests.rb index 3d4c26431..39880539c 100644 --- a/tests/dns/models/record_tests.rb +++ b/tests/dns/models/record_tests.rb @@ -27,7 +27,8 @@ for provider, config in dns_providers if !Fog.mocking? || config[:mocked] zone_attributes = { - :domain => domain_name + :domain => domain_name, + :ttl => 3600 }.merge(config[:zone_attributes] || {}) @zone = Fog::DNS[provider].zones.create(zone_attributes) diff --git a/tests/dns/models/records_tests.rb b/tests/dns/models/records_tests.rb index 49e0bb49c..62e94c095 100644 --- a/tests/dns/models/records_tests.rb +++ b/tests/dns/models/records_tests.rb @@ -15,7 +15,8 @@ for provider, config in dns_providers if !Fog.mocking? || config[:mocked] zone_attributes = { - :domain => domain_name + :domain => domain_name, + :ttl => 3600 }.merge(config[:zone_attributes] || {}) @zone = Fog::DNS[provider].zones.create(zone_attributes) diff --git a/tests/dns/models/zone_tests.rb b/tests/dns/models/zone_tests.rb index 3aa7efab3..9daa8ae4f 100644 --- a/tests/dns/models/zone_tests.rb +++ b/tests/dns/models/zone_tests.rb @@ -8,7 +8,8 @@ for provider, config in dns_providers Shindo.tests("Fog::DNS[:#{provider}] | zone", [provider.to_s]) do zone_attributes = { - :domain => domain_name + :domain => domain_name, + :ttl => 3600 }.merge!(config[:zone_attributes] || {}) model_tests(Fog::DNS[provider].zones, zone_attributes, config[:mocked]) diff --git a/tests/dns/models/zones_tests.rb b/tests/dns/models/zones_tests.rb index 5bf8cd547..3161be6e5 100644 --- a/tests/dns/models/zones_tests.rb +++ b/tests/dns/models/zones_tests.rb @@ -8,7 +8,8 @@ for provider, config in dns_providers Shindo.tests("Fog::DNS[:#{provider}] | zones", [provider.to_s]) do zone_attributes = { - :domain => domain_name + :domain => domain_name, + :ttl => 3600 }.merge!(config[:zone_attributes] || {}) collection_tests(Fog::DNS[provider].zones, zone_attributes, config[:mocked])