diff --git a/manifests/sink.pp b/manifests/sink.pp index 35111ceb..c85cbffc 100644 --- a/manifests/sink.pp +++ b/manifests/sink.pp @@ -46,11 +46,11 @@ class designate::sink ( if $enabled_notification_handlers { designate_config { - 'service:sink/enabled_notification_handlers': value => join($enabled_notification_handlers,',') + 'service:sink/enabled_notification_handlers': value => join(any2array($enabled_notification_handlers),',') } } else { designate_config { - 'service:sink/enabled_notification_handlers': ensure => absent + 'service:sink/enabled_notification_handlers': ensure => absent } } diff --git a/spec/classes/designate_sink_spec.rb b/spec/classes/designate_sink_spec.rb index 52635df7..27dab087 100644 --- a/spec/classes/designate_sink_spec.rb +++ b/spec/classes/designate_sink_spec.rb @@ -26,12 +26,27 @@ describe 'designate::sink' do ) is_expected.to contain_designate_config('service:sink/enabled_notification_handlers').with_ensure('absent') end + end - context 'when using enabled_notification_handlers' do - before { params.merge!(:enabled_notification_handlers => ['nova_fixed','neutron_floatingip']) } - it 'configures designate-sink with enabled_notification_handlers' do - is_expected.to contain_designate_config('service:sink/enabled_notification_handlers').with_value(['nova_fixed,neutron_floatingip']) - end + context 'with enabled_notification_handlers (array)' do + before do + params.merge!( + :enabled_notification_handlers => ['nova_fixed', 'neutron_floatingip'] + ) + end + it 'configures designate-sink with enabled_notification_handlers' do + is_expected.to contain_designate_config('service:sink/enabled_notification_handlers').with_value('nova_fixed,neutron_floatingip') + end + end + + context 'with enabled_notification_handlers (string)' do + before do + params.merge!( + :enabled_notification_handlers => 'nova_fixed,neutron_floatingip' + ) + end + it 'configures designate-sink with enabled_notification_handlers' do + is_expected.to contain_designate_config('service:sink/enabled_notification_handlers').with_value('nova_fixed,neutron_floatingip') end end