openstack/puppet-nova
Code Issues Proposed changes

Deprecate support for [DEFAULT] libvirt_use_virtio_for_bridges

Browse Source 
... because the parameter was deprecated during Icehouse cycle in favor
of the new [libvirt] use_virtio_for_bridges[1], and was removed during
Juno cycle[2].

The parameter has been ineffective for multiple cycles so this change
just deprecates the parameter instead of fixing it. In case we need
the parameter then it should be implemented in the libvirt class.

[1] 5cfc529179302e8aefd1b255769d532881e22533
[2] d0a02fa390e4bd70b03390d6bdbb35d8d9c159dd

Change-Id: I2508de949a3adad8b710a24d68a39b6d4ec30b5d
This commit is contained in:
Takashi Kajinami 2022-05-30 17:07:05 +09:00
parent b4c3c5217c
commit 9101ad68bf
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/compute.pp
View File

@ -58,10 +58,6 @@
# (optional) Name or path of the tool used for ISO image creation.
# Defaults to $::os_service_default
#
# [*virtio_nic*]
# (optional) Whether to use virtio for the nic driver of VMs
# Defaults to false
#
# [*instance_usage_audit*]
# (optional) Generate periodic compute.instance.exists notifications.
# Defaults to false
@ -277,6 +273,10 @@
# (optional) Barbican API version.
# Defaults to undef
#
# [*virtio_nic*]
# (optional) Whether to use virtio for the nic driver of VMs
# Defaults to undef
#
class nova::compute (
$enabled = true,
$manage_service = true,
@ -289,7 +289,6 @@ class nova::compute (
$vncproxy_port = '6080',
$vncproxy_path = '/vnc_auto.html',
$force_config_drive = false,
$virtio_nic = false,
$instance_usage_audit = false,
$instance_usage_audit_period = 'month',
$mkisofs_cmd = $::os_service_default,
@ -333,6 +332,7 @@ class nova::compute (
$barbican_auth_endpoint = undef,
$barbican_endpoint = undef,
$barbican_api_version = undef,
$virtio_nic = undef,
) {
include nova::deps
@ -481,10 +481,10 @@ class nova::compute (
nova_config { 'DEFAULT/force_config_drive': ensure => absent }
}
if $virtio_nic {
# Enable the virtio network card for instances
nova_config { 'DEFAULT/libvirt_use_virtio_for_bridges': value => true }
if $virtio_nic != undef {
warning('The nova::compute::virtio_nic parameter has been deprecated and has no effect.')
}
nova_config { 'DEFAULT/libvirt_use_virtio_for_bridges': ensure => absent }
if $instance_usage_audit and $instance_usage_audit_period in ['hour', 'day', 'month', 'year'] {
nova_config {

5
releasenotes/notes/deprecate-compute-virtio_nic-004dcfb3791f17b4.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``nova::compute::virtio_nic`` parameter has been deprecated and has no
effect now.