Merge "nova: Default to the unversioned q35 machine type on x86_64"

This commit is contained in:
Zuul 2021-04-30 16:35:49 +00:00 committed by Gerrit Code Review
commit 5fd7b3c9f6
3 changed files with 25 additions and 4 deletions

View File

@ -432,7 +432,7 @@ parameters:
NovaHWMachineType: NovaHWMachineType:
description: > description: >
To specify a default machine type per host architecture. To specify a default machine type per host architecture.
default: '' default: 'x86_64=q35'
type: string type: string
tags: tags:
- role_specific - role_specific

View File

@ -0,0 +1,10 @@
# A Heat environment file to pin NovaHWMachineType and in turn
# [libvirt]hw_machine_type to the legacy default machine types during
# an upgrade. This allows operators to then ensure a machine type is
# recorded for existing instances *before* changing to the new
# default. See the following Nova documentation for more details:
#
# https://docs.openstack.org/nova/latest/admin/hw-machine-type.html
#
parameter_defaults:
NovaHWMachineType: 'x86_64=pc-i440fx-rhel7.6.0,aarch64=virt-rhel7.6.0,ppc64=pseries-rhel7.6.0,ppc64le=pseries-rhel7.6.0'

View File

@ -1,6 +1,17 @@
--- ---
upgrade: upgrade:
- | - |
The ``NovaHWMachineType`` parameter now defaults to an empty string with The ``NovaHWMachineType`` parameter now defaults ``x86_64`` based instances
per architecture machine type defaults instead being provided directly by to the unversioned ``q35`` machine type. The remaining architecture machine
OpenStack Nova. type defaults being provided directly by OpenStack Nova.
A ``environments/nova-hw-machine-type-upgrade.yaml`` environment file has
been provided to pin ``NovaHWMachineType`` to the previous versioned
machine type defaults during an upgrade.
When the upgrade of the overcloud is complete the following OpenStack Nova
documentation should then be used to ensure a machine type is recorded for
all existing instances before the new ``NovaHWMachineType`` default can be
used in the environment.
https://docs.openstack.org/nova/latest/admin/hw-machine-type.html#update