Merge "Fix pci config params name as mentioned in nova conf"
This commit is contained in:
commit
c47cf92e6a
@ -537,7 +537,7 @@ as a standalone service, or httpd for being run by a httpd server")
|
||||
|
||||
if $pci_alias {
|
||||
nova_config {
|
||||
'pci/pci_alias': value => join(any2array(check_array_of_hash($pci_alias)), ',');
|
||||
'pci/alias': value => join(any2array(check_array_of_hash($pci_alias)), ',');
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
'pci/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;
|
||||
|
@ -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``
|
@ -184,7 +184,7 @@ describe 'nova::api' do
|
||||
end
|
||||
|
||||
it 'configures nova pci_alias entries' do
|
||||
is_expected.to contain_nova_config('pci/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
|
||||
|
@ -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('pci/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
|
||||
@ -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('pci/pci_passthrough_whitelist').with(:value => '<SERVICE DEFAULT>')
|
||||
is_expected.to contain_nova_config('pci/passthrough_whitelist').with(:value => '<SERVICE DEFAULT>')
|
||||
end
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user