diff --git a/manifests/compute.pp b/manifests/compute.pp index 341f49b54..afd13aafe 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -253,12 +253,6 @@ # retries on failures # Defaults to $::os_service_default # -# DEPRECATED PARAMETERS -# -# [*virtio_nic*] -# (optional) Whether to use virtio for the nic driver of VMs -# Defaults to undef -# class nova::compute ( $enabled = true, $manage_service = true, @@ -309,8 +303,6 @@ class nova::compute ( $image_type_exclude_list = $::os_service_default, $block_device_allocate_retries = $::os_service_default, $block_device_allocate_retries_interval = $::os_service_default, - # DEPRECATED PARAMETERS - $virtio_nic = undef, ) { include nova::deps @@ -449,11 +441,6 @@ class nova::compute ( nova_config { 'DEFAULT/force_config_drive': ensure => absent } } - 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 { 'DEFAULT/instance_usage_audit': value => $instance_usage_audit; diff --git a/releasenotes/notes/remove-compute-virtio_nic-33319c3a5b6e8cc3.yaml b/releasenotes/notes/remove-compute-virtio_nic-33319c3a5b6e8cc3.yaml new file mode 100644 index 000000000..c34615f5b --- /dev/null +++ b/releasenotes/notes/remove-compute-virtio_nic-33319c3a5b6e8cc3.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``nova::compute::virtio_nic`` parameter has been removed.