openstack/puppet-nova
Code Issues Proposed changes

Drop too strict validation of instance_usage_audit_period

Browse Source 
The instance_usage_audit_period option supports the values with offset
like month@15. This removes the format check which is too strict and
ignore values with offset.

Closes-Bug: #2012117
Change-Id: I01e55a4aaaefd5174d35d551d3dd32f6c37b6b6b
This commit is contained in:
Takashi Kajinami
2023-03-18 16:19:55 +09:00
parent 7688084aed
commit b7dc7fbbfe
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/compute.pp
View File

@@ -64,8 +64,8 @@
# #
# [*instance_usage_audit_period*] # [*instance_usage_audit_period*]
# (optional) Time period to generate instance usages for. # (optional) Time period to generate instance usages for.
# Time period must be hour, day, month or year # Time period must be hour, day, month or year with/without offset.
# Defaults to 'month' # Defaults to $facts['os_service_default']
# #
# [*use_cow_images*] # [*use_cow_images*]
# (optional) Enable use of copy-on-write (cow) images. # (optional) Enable use of copy-on-write (cow) images.
@@ -266,7 +266,7 @@ class nova::compute (
$vncproxy_path = '/vnc_auto.html', $vncproxy_path = '/vnc_auto.html',
$force_config_drive = false, $force_config_drive = false,
$instance_usage_audit = false, $instance_usage_audit = false,
$instance_usage_audit_period = 'month', $instance_usage_audit_period = $facts['os_service_default'],
$mkisofs_cmd = $facts['os_service_default'], $mkisofs_cmd = $facts['os_service_default'],
$use_cow_images = $facts['os_service_default'], $use_cow_images = $facts['os_service_default'],
$force_raw_images = $facts['os_service_default'], $force_raw_images = $facts['os_service_default'],
@@ -447,7 +447,7 @@ class nova::compute (
nova_config { 'DEFAULT/force_config_drive': ensure => absent } nova_config { 'DEFAULT/force_config_drive': ensure => absent }
} }
if $instance_usage_audit and $instance_usage_audit_period in ['hour', 'day', 'month', 'year'] { if $instance_usage_audit {
nova_config { nova_config {
'DEFAULT/instance_usage_audit': value => $instance_usage_audit; 'DEFAULT/instance_usage_audit': value => $instance_usage_audit;
'DEFAULT/instance_usage_audit_period': value => $instance_usage_audit_period; 'DEFAULT/instance_usage_audit_period': value => $instance_usage_audit_period;

10
spec/classes/nova_compute_spec.rb
View File

@@ -326,16 +326,6 @@ describe 'nova::compute' do
it { is_expected.to contain_nova_config('DEFAULT/instance_usage_audit_period').with_ensure('absent') } it { is_expected.to contain_nova_config('DEFAULT/instance_usage_audit_period').with_ensure('absent') }
end end
context 'with instance_usage_audit parameter and wrong period' do
let :params do
{ :instance_usage_audit => true,
:instance_usage_audit_period => 'fake', }
end
it { is_expected.to contain_nova_config('DEFAULT/instance_usage_audit').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/instance_usage_audit_period').with_ensure('absent') }
end
context 'with instance_usage_audit parameter and period' do context 'with instance_usage_audit parameter and period' do
let :params do let :params do
{ :instance_usage_audit => true, { :instance_usage_audit => true,