openstack
/
puppet-nova
Code Issues Proposed changes

Fix pci config params name as mentioned in nova conf 

This change, modifies name of params, as mentioned in sample
nova conf [1].
The parameter name in PCI section should be `alias` and
`passthrough_whitelist` instead of `pci_alias` and
`pci_passthrough_whitelist`.

[1] https://docs.openstack.org/nova/latest/sample_config.html

Conflicts:
        manifests/api.pp
        manifests/compute.pp
        spec/classes/nova_api_spec.rb
        spec/classes/nova_compute_spec.rb

Change-Id: Ia7d8c0c900b3cb05d809e62e5c203d183b357fce
Related-Bug: #1696955
(cherry picked from commit 018c8a2900)
This commit is contained in:
Rajesh Tailor 2017-07-06 15:45:47 +05:30
parent 1f4356c8b1
commit 22b107f54c
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

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

2
manifests/compute.pp
View File

@ -249,7 +249,7 @@ is used. It will be removed once Nova removes it.")
'DEFAULT/reserved_host_memory_mb': value => $reserved_host_memory;
'DEFAULT/compute_manager': value => $compute_manager;
'DEFAULT/heal_instance_info_cache_interval': value => $heal_instance_info_cache_interval;
'DEFAULT/pci_passthrough_whitelist': value => $pci_passthrough_real;
'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/fix-pci-config-params-bfa54021a532c237.yaml Normal file
View File

@ -0,0 +1,9 @@
---
fixes:
- |
PCI configuration options name should be same as mentioned in nova
configuration file, since these are moved to PCI section.
Options affected by this change:
* ``pci_alias`` to ``alias``
* ``pci_passthrough_whitelist`` to ``passthrough_whitelist``

2
spec/classes/nova_api_spec.rb
View File

@ -160,7 +160,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/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

@ -142,7 +142,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/passthrough_whitelist').with(
'value' => "[{\"vendor_id\":\"8086\",\"product_id\":\"0126\"},{\"vendor_id\":\"9096\",\"product_id\":\"1520\",\"physical_network\":\"physnet1\"}]"
)
end
@ -166,7 +166,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/passthrough_whitelist').with(:value => '<SERVICE DEFAULT>')
end
end