diff --git a/manifests/compute.pp b/manifests/compute.pp index c3eb2cc26..1474b0629 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -113,16 +113,6 @@ # for virtual machine processes # Defaults to $::os_service_default # -# [*cpu_allocation_ratio*] -# (optional) Virtual CPU to physical CPU allocation ratio which -# affects all CPU filters. -# Defaults to $::os_service_default -# -# [*ram_allocation_ratio*] -# (optional) Virtual ram to physical ram allocation ratio which -# affects all ram filters. -# Defaults to $::os_service_default -# # DEPRECATED PARAMETERS # # [*default_availability_zone*] @@ -163,8 +153,6 @@ class nova::compute ( $config_drive_format = undef, $allow_resize_to_same_host = false, $vcpu_pin_set = $::os_service_default, - $cpu_allocation_ratio = $::os_service_default, - $ram_allocation_ratio = $::os_service_default, # DEPRECATED PARAMETERS $default_availability_zone = undef, $default_schedule_zone = undef, @@ -194,8 +182,6 @@ class nova::compute ( 'DEFAULT/heal_instance_info_cache_interval': value => $heal_instance_info_cache_interval; 'DEFAULT/allow_resize_to_same_host': value => $allow_resize_to_same_host; 'DEFAULT/vcpu_pin_set': value => join(any2array($vcpu_pin_set), ','); - 'DEFAULT/cpu_allocation_ratio': value => $cpu_allocation_ratio; - 'DEFAULT/ram_allocation_ratio': value => $ram_allocation_ratio; } if ($vnc_enabled) { diff --git a/spec/classes/nova_compute_spec.rb b/spec/classes/nova_compute_spec.rb index 35ff295c9..ee089f3ca 100644 --- a/spec/classes/nova_compute_spec.rb +++ b/spec/classes/nova_compute_spec.rb @@ -61,8 +61,6 @@ describe 'nova::compute' do :pci_passthrough => "[{\"vendor_id\":\"8086\",\"product_id\":\"0126\"},{\"vendor_id\":\"9096\",\"product_id\":\"1520\",\"physical_network\":\"physnet1\"}]", :config_drive_format => 'vfat', :vcpu_pin_set => ['4-12','^8','15'], - :cpu_allocation_ratio => '32.0', - :ram_allocation_ratio => '2.0', } end @@ -111,10 +109,6 @@ describe 'nova::compute' do it { is_expected.to contain_nova_config('DEFAULT/vcpu_pin_set').with(:value => '4-12,^8,15') } - it { is_expected.to contain_nova_config('DEFAULT/cpu_allocation_ratio').with(:value => '32.0') } - - it { is_expected.to contain_nova_config('DEFAULT/ram_allocation_ratio').with(:value => '2.0') } - it 'configures nova pci_passthrough_whitelist entries' do is_expected.to contain_nova_config('DEFAULT/pci_passthrough_whitelist').with( 'value' => "[{\"vendor_id\":\"8086\",\"product_id\":\"0126\"},{\"vendor_id\":\"9096\",\"product_id\":\"1520\",\"physical_network\":\"physnet1\"}]"