Rename 'tag' parameter
This conflicts with the metaparameter implemented in puppet itself. Rename it to avoid conflict. Change-Id: I4a862df9f64b289845b2288c544f5161fec23a49 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -46,9 +46,9 @@
|
|||||||
# Optional. Default is undef.
|
# Optional. Default is undef.
|
||||||
# Increase or decrease the replica level of a pool.
|
# Increase or decrease the replica level of a pool.
|
||||||
#
|
#
|
||||||
# [*tag*] Pool tag.
|
# [*application*] Application the pool is associated with.
|
||||||
# Optional. Default is undef.
|
# Optional. Default is undef.
|
||||||
# cephfs,rbd,rgw or freeform for custom application.
|
# cephfs, rbd, rgw or freeform for custom application.
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
#
|
#
|
||||||
@@ -61,7 +61,7 @@ define ceph::pool (
|
|||||||
Integer[0] $pg_num = 64,
|
Integer[0] $pg_num = 64,
|
||||||
Optional[Integer[0]] $pgp_num = undef,
|
Optional[Integer[0]] $pgp_num = undef,
|
||||||
Optional[Integer[0]] $size = undef,
|
Optional[Integer[0]] $size = undef,
|
||||||
Optional[String[1]] $tag = undef,
|
Optional[String[1]] $application = undef,
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
Optional[Float[0]] $exec_timeout = undef,
|
Optional[Float[0]] $exec_timeout = undef,
|
||||||
) {
|
) {
|
||||||
@@ -86,6 +86,6 @@ define ceph::pool (
|
|||||||
pgp_num => $pgp_num,
|
pgp_num => $pgp_num,
|
||||||
size => $size,
|
size => $size,
|
||||||
cluster => $cluster,
|
cluster => $cluster,
|
||||||
application => $tag,
|
application => $application,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
5
releasenotes/notes/rename-tag-c6beebada022f499.yaml
Normal file
5
releasenotes/notes/rename-tag-c6beebada022f499.yaml
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``ceph::pool::tag`` parameter has been renamed to the ``application``
|
||||||
|
parameter, due to conflict with metaparameters.
|
@@ -27,11 +27,11 @@ describe 'ceph::pool' do
|
|||||||
describe "create with custom params" do
|
describe "create with custom params" do
|
||||||
let :params do
|
let :params do
|
||||||
{
|
{
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
:pg_num => 4,
|
:pg_num => 4,
|
||||||
:pgp_num => 3,
|
:pgp_num => 3,
|
||||||
:size => 2,
|
:size => 2,
|
||||||
:tag => 'rbd',
|
:application => 'rbd',
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user