Merge "Add support for [quota] count_usage_from_placement"
This commit is contained in:
commit
7129762029
@ -53,6 +53,10 @@
|
|||||||
# quota to be exceeded.
|
# quota to be exceeded.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
|
# [*count_usage_from_placement*]
|
||||||
|
# (optional Enable the counting of quota usage from the placement service.
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
class nova::quota(
|
class nova::quota(
|
||||||
$driver = $::os_service_default,
|
$driver = $::os_service_default,
|
||||||
$instances = $::os_service_default,
|
$instances = $::os_service_default,
|
||||||
@ -66,6 +70,7 @@ class nova::quota(
|
|||||||
$server_groups = $::os_service_default,
|
$server_groups = $::os_service_default,
|
||||||
$server_group_members = $::os_service_default,
|
$server_group_members = $::os_service_default,
|
||||||
$recheck_quota = $::os_service_default,
|
$recheck_quota = $::os_service_default,
|
||||||
|
$count_usage_from_placement = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include nova::deps
|
include nova::deps
|
||||||
@ -83,5 +88,6 @@ class nova::quota(
|
|||||||
'quota/server_groups': value => $server_groups;
|
'quota/server_groups': value => $server_groups;
|
||||||
'quota/server_group_members': value => $server_group_members;
|
'quota/server_group_members': value => $server_group_members;
|
||||||
'quota/recheck_quota': value => $recheck_quota;
|
'quota/recheck_quota': value => $recheck_quota;
|
||||||
|
'quota/count_usage_from_placement': value => $count_usage_from_placement;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``nova::quota::count_usage_from_placement`` parameter has been
|
||||||
|
added.
|
@ -18,6 +18,7 @@ describe 'nova::quota' do
|
|||||||
:server_groups => '<SERVICE DEFAULT>',
|
:server_groups => '<SERVICE DEFAULT>',
|
||||||
:server_group_members => '<SERVICE DEFAULT>',
|
:server_group_members => '<SERVICE DEFAULT>',
|
||||||
:recheck_quota => '<SERVICE DEFAULT>',
|
:recheck_quota => '<SERVICE DEFAULT>',
|
||||||
|
:count_usage_from_placement => '<SERVICE DEFAULT>',
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -52,6 +53,7 @@ describe 'nova::quota' do
|
|||||||
:server_groups => 20,
|
:server_groups => 20,
|
||||||
:server_group_members => 20,
|
:server_group_members => 20,
|
||||||
:recheck_quota => true,
|
:recheck_quota => true,
|
||||||
|
:count_usage_from_placement => false,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user