Deprecate invalid ironic_api_paste_ini
Ironic has never used api-paste.ini but defines pipeline in code. The ironic_api_paste_ini resource type to manage api-paste.ini is deprecated because the resource is just invalid. Change-Id: I5fc1d691642f184b6fdd4bfcba5314b3ea11b583
This commit is contained in:
@@ -3,7 +3,7 @@ Puppet::Type.newtype(:ironic_api_paste_ini) do
|
|||||||
ensurable
|
ensurable
|
||||||
|
|
||||||
newparam(:name, :namevar => true) do
|
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+/)
|
newvalues(/\S+\/\S+/)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,8 @@
|
|||||||
# DEFAULT/bar:
|
# DEFAULT/bar:
|
||||||
# value: barValue
|
# value: barValue
|
||||||
#
|
#
|
||||||
|
# DEPRECATED PARAMETERS
|
||||||
|
#
|
||||||
# [*ironic_api_paste_ini*]
|
# [*ironic_api_paste_ini*]
|
||||||
# (optional) Allow configuration of /etc/ironic/api-paste.ini options.
|
# (optional) Allow configuration of /etc/ironic/api-paste.ini options.
|
||||||
#
|
#
|
||||||
@@ -25,14 +27,17 @@
|
|||||||
#
|
#
|
||||||
class ironic::config (
|
class ironic::config (
|
||||||
$ironic_config = {},
|
$ironic_config = {},
|
||||||
$ironic_api_paste_ini = {},
|
# DEPRECATED PARAMETERS
|
||||||
|
$ironic_api_paste_ini = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ironic::deps
|
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_config)
|
||||||
validate_legacy(Hash, 'validate_hash', $ironic_api_paste_ini)
|
|
||||||
|
|
||||||
create_resources('ironic_config', $ironic_config)
|
create_resources('ironic_config', $ironic_config)
|
||||||
create_resources('ironic_api_paste_ini', $ironic_api_paste_ini)
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.
|
||||||
@@ -7,11 +7,6 @@ describe 'ironic::config' do
|
|||||||
'DEFAULT/foo' => { 'value' => 'fooValue' },
|
'DEFAULT/foo' => { 'value' => 'fooValue' },
|
||||||
'DEFAULT/bar' => { 'value' => 'barValue' },
|
'DEFAULT/bar' => { 'value' => 'barValue' },
|
||||||
'DEFAULT/baz' => { 'ensure' => 'absent' }
|
'DEFAULT/baz' => { 'ensure' => 'absent' }
|
||||||
},
|
|
||||||
:ironic_api_paste_ini => {
|
|
||||||
'DEFAULT/foo2' => { 'value' => 'fooValue' },
|
|
||||||
'DEFAULT/bar2' => { 'value' => 'barValue' },
|
|
||||||
'DEFAULT/baz2' => { 'ensure' => 'absent' }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
@@ -24,12 +19,6 @@ describe 'ironic::config' do
|
|||||||
should contain_ironic_config('DEFAULT/bar').with_value('barValue')
|
should contain_ironic_config('DEFAULT/bar').with_value('barValue')
|
||||||
should contain_ironic_config('DEFAULT/baz').with_ensure('absent')
|
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
|
end
|
||||||
|
|
||||||
on_supported_os({
|
on_supported_os({
|
||||||
|
|||||||
Reference in New Issue
Block a user