From c4a990e817d79bfaf6a3c138383fc931bd7ebdb3 Mon Sep 17 00:00:00 2001 From: David Moreau-Simard Date: Mon, 4 Jul 2016 21:29:46 -0400 Subject: [PATCH] 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 --- manifests/central.pp | 4 ++-- spec/classes/designate_central_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/central.pp b/manifests/central.pp index 578a8e83..f9a48dc3 100644 --- a/manifests/central.pp +++ b/manifests/central.pp @@ -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 { diff --git a/spec/classes/designate_central_spec.rb b/spec/classes/designate_central_spec.rb index db4da7da..a2bfb8bb 100644 --- a/spec/classes/designate_central_spec.rb +++ b/spec/classes/designate_central_spec.rb @@ -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('') end context 'when using Power DNS backend driver' do