openstack/puppet-nova
Code Issues Proposed changes

compute: Remove vcpu_pin_set parameter

Browse Source 
... because the parameter was deprecated a few cycles ago[1].

[1] cf666bd557

Change-Id: Iebf36d3ad3ad5ee3eb75147ec6e34b2116cad490
This commit is contained in:
Takashi Kajinami
2022-05-10 21:06:17 +09:00
parent a88016b1a6
commit 670b032277
3 changed files with 11 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
manifests/compute.pp
View File

@@ -145,9 +145,8 @@
# Defaults to $::os_service_default
#
# [*cpu_shared_set*]
# (optional) A list or range of host CPU cores to which emulator threads can be
# scheduled, if vcpu_pin_set is set, or to which both emulator threads and processes
# for unpinned instance CPUs (VCPUs) can be scheduled, if vcpu_pin_set is unset.
# (optional) Mask of host CPUs that can be used for ``VCPU`` resources and
# offloaded emulator threads.
# Defaults to $::os_service_default
#
# [*cpu_dedicated_set*]
@@ -260,16 +259,6 @@
#
# DEPRECATED PARAMETERS
#
# [*vcpu_pin_set*]
# (optional) A list or range of host CPU cores to which processes for
# unpinned instance CPUs (VCPUs) can be scheduled, if cpu_shared_set is set,
# or to which both emulator threads and processes for unpinned instance CPUs
# (VCPUs) can be scheduled, if cpu_shared_set is unset.
# This option has been superseded by the ``cpu_shared_set`` and
# ``cpu_dedicated_set`` options, which allows co-existence of
# pinned and unpinned instances on the same host.
# Defaults to undef
#
# [*keymgr_backend*]
# (optional) Key Manager service class.
# Example of valid value: castellan.key_manager.barbican_key_manager.BarbicanKeyManager
@@ -340,7 +329,6 @@ class nova::compute (
$block_device_allocate_retries = $::os_service_default,
$block_device_allocate_retries_interval = $::os_service_default,
# DEPRECATED PARAMETERS
$vcpu_pin_set = undef,
$keymgr_backend = undef,
$barbican_auth_endpoint = undef,
$barbican_endpoint = undef,
@@ -350,9 +338,6 @@ class nova::compute (
include nova::deps
include nova::params
$cpu_shared_set_real = join(any2array($cpu_shared_set), ',')
$cpu_dedicated_set_real = join(any2array($cpu_dedicated_set), ',')
$image_type_exclude_list_real = pick(join(any2array($image_type_exclude_list), ','), $::os_service_default)
include nova::pci
@@ -363,41 +348,9 @@ class nova::compute (
fail('vnc_enabled and spice_enabled is mutually exclusive')
}
if $vcpu_pin_set {
warning('vcpu_pin_set is deprecated, instead use cpu_dedicated_set or cpu_shared_set.')
}
if empty($vcpu_pin_set) {
$vcpu_pin_set_real = undef
} else {
$vcpu_pin_set_real = join(any2array($vcpu_pin_set), ',')
}
if $vcpu_pin_set_real and !is_service_default($cpu_dedicated_set_real) {
fail('vcpu_pin_set is deprecated. vcpu_pin_set and cpu_dedicated_set are mutually exclusive.')
}
if $vcpu_pin_set_real != undef {
# handle the following conditions:
#
# 1. if vcpu_pin_set is set but cpu_shared_set is not set.
# 2. if cpu_shared_set and vcpu_pin_set both are set, but cpu_dedicated_set is not set.
nova_config {
'compute/cpu_shared_set': value => $cpu_shared_set_real;
'compute/cpu_dedicated_set': value => $cpu_dedicated_set_real;
'DEFAULT/vcpu_pin_set': value => $vcpu_pin_set_real;
}
} else {
# handle the following conditions:
#
# 3. if cpu_dedicated_set is set but cpu_shared_set is not set.
# 4. if cpu_shared_set is set but vcpu_pin_set and cpu_dedicated_set are not set.
# 5. if cpu_shared_set and cpu_dedicated_set both are set, then ignore vcpu_pin_set.
nova_config {
'compute/cpu_shared_set': value => $cpu_shared_set_real;
'compute/cpu_dedicated_set': value => $cpu_dedicated_set_real;
'DEFAULT/vcpu_pin_set': ensure => absent; # when undef, don't include in conf.
}
nova_config {
'compute/cpu_shared_set': value => join(any2array($cpu_shared_set), ',');
'compute/cpu_dedicated_set': value => join(any2array($cpu_dedicated_set), ',');
}
if !empty($neutron_physnets_numa_nodes_mapping) {

4
releasenotes/notes/remove-vcpu_pin_set-165a7b2d4230c978.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
upgrade:
- |
The ``nova::compute::vcpu_pin_set_parameter`` was removed.

37
spec/classes/nova_compute_spec.rb
View File

@@ -234,16 +234,7 @@ describe 'nova::compute' do
end
end
context 'should raise an error, when cpu_dedicated_set and vcpu_pin_set both are defined' do
let :params do
{ :vcpu_pin_set => ['4-12','^8','15'],
:cpu_dedicated_set => ['4-12','^8','15'], }
end
it { should raise_error(Puppet::Error, /vcpu_pin_set is deprecated. vcpu_pin_set and cpu_dedicated_set are mutually exclusive./) }
end
context 'when cpu_shared_set and cpu_dedicated_set both are set, but not vcpu_pin_set' do
context 'when cpu_shared_set and cpu_dedicated_set both are set' do
let :params do
{ :cpu_shared_set => ['4-12','^8','15'],
:cpu_dedicated_set => ['2-10','^5','14'], }
@@ -251,7 +242,6 @@ describe 'nova::compute' do
it { is_expected.to contain_nova_config('compute/cpu_shared_set').with_value('4-12,^8,15') }
it { is_expected.to contain_nova_config('compute/cpu_dedicated_set').with_value('2-10,^5,14') }
it { is_expected.to contain_nova_config('DEFAULT/vcpu_pin_set').with_ensure('absent') }
end
context 'when cpu_dedicated_set is defined but cpu_shared_set is not' do
@@ -261,38 +251,15 @@ describe 'nova::compute' do
it { is_expected.to contain_nova_config('compute/cpu_dedicated_set').with_value('4-12,^8,15') }
it { is_expected.to contain_nova_config('compute/cpu_shared_set').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('DEFAULT/vcpu_pin_set').with_ensure('absent') }
end
context 'when cpu_shared_set is defined, but cpu_dedicated_set and vcpu_pin_set are not' do
context 'when cpu_shared_set is defined, but cpu_dedicated_set is not' do
let :params do
{ :cpu_shared_set => ['4-12', '^8', '15'] }
end
it { is_expected.to contain_nova_config('compute/cpu_shared_set').with_value('4-12,^8,15') }
it { is_expected.to contain_nova_config('compute/cpu_dedicated_set').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('DEFAULT/vcpu_pin_set').with_ensure('absent') }
end
context 'when cpu_shared_set and vcpu_pin_set are defined, but cpu_dedicated_set is not' do
let :params do
{ :cpu_shared_set => ['4-12','^8','15'],
:vcpu_pin_set => ['2-10','^5','14'], }
end
it { is_expected.to contain_nova_config('compute/cpu_shared_set').with_value('4-12,^8,15') }
it { is_expected.to contain_nova_config('DEFAULT/vcpu_pin_set').with_value('2-10,^5,14') }
it { is_expected.to contain_nova_config('compute/cpu_dedicated_set').with_value('<SERVICE DEFAULT>') }
end
context 'when vcpu_pin_set is set, but cpu_shared_set and cpu_dedicated_set are not' do
let :params do
{ :vcpu_pin_set => ['4-12','^8','15'] }
end
it { is_expected.to contain_nova_config('DEFAULT/vcpu_pin_set').with_value('4-12,^8,15') }
it { is_expected.to contain_nova_config('compute/cpu_shared_set').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('compute/cpu_dedicated_set').with_value('<SERVICE DEFAULT>') }
end
context 'when neutron_physnets_numa_nodes_mapping and neutron_tunnel_numa_nodes are empty' do