openstack
/
puppet-nova
Code Issues Proposed changes

Move PCI options to PCI group 

This change I886045ab4e6bdb8418fd1ccdcd811417ecb4ad4a has moved PCI
configuration options to 'pci' group. They should no longer be
included in the "DEFAULT' group. The following options affected by
this change:
``pci_alias``
``pci_passthrough_whilelist``

Change-Id: Ia973da9d60c4d4cec14b861db47a76d219da5a9f
This commit is contained in:
Rajesh Tailor 2017-06-02 14:35:59 +05:30
parent 99dc3ba634
commit e6a438eeef
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/api.pp
View File

@ -534,7 +534,7 @@ as a standalone service, or httpd for being run by a httpd server")
if $pci_alias {
nova_config {
'DEFAULT/pci_alias': value => check_array_of_hash($pci_alias);
'pci/pci_alias': value => check_array_of_hash($pci_alias);
}
}

2
manifests/compute.pp
View File

@ -204,7 +204,7 @@ class nova::compute (
nova_config {
'DEFAULT/reserved_host_memory_mb': value => $reserved_host_memory;
'DEFAULT/heal_instance_info_cache_interval': value => $heal_instance_info_cache_interval;
'DEFAULT/pci_passthrough_whitelist': value => $pci_passthrough_real;
'pci/pci_passthrough_whitelist': value => $pci_passthrough_real;
'DEFAULT/resize_confirm_window': value => $resize_confirm_window;
'DEFAULT/vcpu_pin_set': value => $vcpu_pin_set_real;
'DEFAULT/resume_guests_state_on_host_boot': value => $resume_guests_state_on_host_boot;

9
releasenotes/notes/move-pci-config-to-pci-group-441c47b2d1c36837.yaml Normal file
View File

@ -0,0 +1,9 @@
---
upgrade:
- |
PCI configuration options have been moved to the 'pci' group. They
should no longer be included in the 'DEFAULT' group. Options affected
by this change:
* ``pci_alias``
* ``pci_passthrough_whitelist``

2
spec/classes/nova_api_spec.rb
View File

@ -187,7 +187,7 @@ describe 'nova::api' do
end
it 'configures nova pci_alias entries' do
is_expected.to contain_nova_config('DEFAULT/pci_alias').with(
is_expected.to contain_nova_config('pci/pci_alias').with(
'value' => "[{\"vendor_id\":\"8086\",\"product_id\":\"0126\",\"name\":\"graphic_card\"},{\"vendor_id\":\"9096\",\"product_id\":\"1520\",\"name\":\"network_card\"}]"
)
end

4
spec/classes/nova_compute_spec.rb
View File

@ -131,7 +131,7 @@ describe 'nova::compute' do
it { is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with_value(true) }
it 'configures nova pci_passthrough_whitelist entries' do
is_expected.to contain_nova_config('DEFAULT/pci_passthrough_whitelist').with(
is_expected.to contain_nova_config('pci/pci_passthrough_whitelist').with(
'value' => "[{\"vendor_id\":\"8086\",\"product_id\":\"0126\"},{\"vendor_id\":\"9096\",\"product_id\":\"1520\",\"physical_network\":\"physnet1\"}]"
)
end
@ -155,7 +155,7 @@ describe 'nova::compute' do
is_expected.to contain_nova_config('DEFAULT/vcpu_pin_set').with(:value => '<SERVICE DEFAULT>')
end
it 'clears pci_passthrough configuration' do
is_expected.to contain_nova_config('DEFAULT/pci_passthrough_whitelist').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('pci/pci_passthrough_whitelist').with(:value => '<SERVICE DEFAULT>')
end
end