diff --git a/lib/puppet/type/ironic_api_paste_ini.rb b/lib/puppet/type/ironic_api_paste_ini.rb index ceb0b685..40447863 100644 --- a/lib/puppet/type/ironic_api_paste_ini.rb +++ b/lib/puppet/type/ironic_api_paste_ini.rb @@ -3,7 +3,7 @@ Puppet::Type.newtype(:ironic_api_paste_ini) do ensurable newparam(:name, :namevar => true) do - desc 'Section/setting name to manage from /etc/ironic/api-paste.ini' + desc 'Section/setting name to manage from /etc/ironic/api-paste.ini (DEPRECATED!)' newvalues(/\S+\/\S+/) end diff --git a/manifests/config.pp b/manifests/config.pp index b55b7c5c..94ac1dcf 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -17,6 +17,8 @@ # DEFAULT/bar: # value: barValue # +# DEPRECATED PARAMETERS +# # [*ironic_api_paste_ini*] # (optional) Allow configuration of /etc/ironic/api-paste.ini options. # @@ -25,14 +27,17 @@ # class ironic::config ( $ironic_config = {}, - $ironic_api_paste_ini = {}, + # DEPRECATED PARAMETERS + $ironic_api_paste_ini = undef, ) { include ironic::deps + if $ironic_api_paste_ini != undef { + warning('The ironic_api_paste_ini parameter is deprecated and has no effect') + } + validate_legacy(Hash, 'validate_hash', $ironic_config) - validate_legacy(Hash, 'validate_hash', $ironic_api_paste_ini) create_resources('ironic_config', $ironic_config) - create_resources('ironic_api_paste_ini', $ironic_api_paste_ini) } diff --git a/releasenotes/notes/deprecate-ironic_api_paste_ini-7100439884d6febe.yaml b/releasenotes/notes/deprecate-ironic_api_paste_ini-7100439884d6febe.yaml new file mode 100644 index 00000000..f8caff6c --- /dev/null +++ b/releasenotes/notes/deprecate-ironic_api_paste_ini-7100439884d6febe.yaml @@ -0,0 +1,9 @@ +--- +deprecations: + - | + The ``ironic_api_paste_ini`` resource type has been deprecated and will be + removed in a future release. + + - | + The ``ironic::config::ironic_api_paste_ini`` parameter has been deprecated + and has no effect now. This parameter will be removed in a future release. diff --git a/spec/classes/ironic_config_spec.rb b/spec/classes/ironic_config_spec.rb index 3d3912fc..7693a400 100644 --- a/spec/classes/ironic_config_spec.rb +++ b/spec/classes/ironic_config_spec.rb @@ -7,11 +7,6 @@ describe 'ironic::config' do 'DEFAULT/foo' => { 'value' => 'fooValue' }, 'DEFAULT/bar' => { 'value' => 'barValue' }, 'DEFAULT/baz' => { 'ensure' => 'absent' } - }, - :ironic_api_paste_ini => { - 'DEFAULT/foo2' => { 'value' => 'fooValue' }, - 'DEFAULT/bar2' => { 'value' => 'barValue' }, - 'DEFAULT/baz2' => { 'ensure' => 'absent' } } } end @@ -24,12 +19,6 @@ describe 'ironic::config' do should contain_ironic_config('DEFAULT/bar').with_value('barValue') should contain_ironic_config('DEFAULT/baz').with_ensure('absent') } - - it { - should contain_ironic_api_paste_ini('DEFAULT/foo2').with_value('fooValue') - should contain_ironic_api_paste_ini('DEFAULT/bar2').with_value('barValue') - should contain_ironic_api_paste_ini('DEFAULT/baz2').with_ensure('absent') - } end on_supported_os({