Leave the default value of min_ttl up to the service

The previous default, 'None', would error out with oslo_config
expecting an integer value.

ERROR designate ConfigFileValueError:
 Value for option min_ttl is not valid:
 invalid literal for int() with base 10: 'None'

Change-Id: I056c7fff1607b6e7b9153ed7df4868900dc5ae44
This commit is contained in:
David Moreau-Simard 2016-07-04 21:29:46 -04:00
parent 0e786ff0aa
commit c4a990e817
2 changed files with 3 additions and 3 deletions

View File

@ -43,7 +43,7 @@
#
# [*min_ttl*]
# (optional) Minimum TTL.
# Defaults to None
# Defaults to $::os_service_default
#
class designate::central (
$package_ensure = present,
@ -55,7 +55,7 @@ class designate::central (
$managed_resource_tenant_id = '123456',
$max_domain_name_len = '255',
$max_recordset_name_len = '255',
$min_ttl = 'None',
$min_ttl = $::os_service_default,
) inherits designate {
designate_config {

View File

@ -32,7 +32,7 @@ describe 'designate::central' do
is_expected.to contain_designate_config('service:central/managed_resource_tenant_id').with_value('123456')
is_expected.to contain_designate_config('service:central/max_domain_name_len').with_value('255')
is_expected.to contain_designate_config('service:central/max_recordset_name_len').with_value('255')
is_expected.to contain_designate_config('service:central/min_ttl').with_value('None')
is_expected.to contain_designate_config('service:central/min_ttl').with_value('<SERVICE DEFAULT>')
end
context 'when using Power DNS backend driver' do