From 9b8413e79658989a7217c2e9a887af4d30eb0e64 Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Thu, 8 Apr 2021 11:02:42 +0100 Subject: [PATCH] nova: Remove versioned default machine types Instead rely on the unversioned defaults provided by Nova [1]. The use of versioned machine types should be limited to specific downstream releases to ensure the corner case of live migrations between X.Y+1 and X.Y releases of RHEL will work. Removal of these versioned machine types also allows TripleO to test with both EL based and Fedora based compute hosts that version their machine types differently as discussed previously in bug #1819452. [1] https://github.com/openstack/nova/blob/50fdbc752a9ca9c31488140ef2997ed59d861a41/nova/virt/libvirt/utils.py#L566-L575 Change-Id: I808c033c34dfe1068ebe17dc72fdee5ef63613d8 Related-Bug: #1819452 --- deployment/nova/nova-compute-container-puppet.yaml | 2 +- .../nova-machine-type-default-changed-27244a925f6d6200.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/nova-machine-type-default-changed-27244a925f6d6200.yaml diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index e8548e2f47..e38a6da532 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/deployment/nova/nova-compute-container-puppet.yaml @@ -415,7 +415,7 @@ parameters: NovaHWMachineType: description: > To specify a default machine type per host architecture. - default: 'x86_64=pc-i440fx-rhel7.6.0,aarch64=virt-rhel7.6.0,ppc64=pseries-rhel7.6.0,ppc64le=pseries-rhel7.6.0' + default: '' type: string tags: - role_specific diff --git a/releasenotes/notes/nova-machine-type-default-changed-27244a925f6d6200.yaml b/releasenotes/notes/nova-machine-type-default-changed-27244a925f6d6200.yaml new file mode 100644 index 0000000000..ed237f81e1 --- /dev/null +++ b/releasenotes/notes/nova-machine-type-default-changed-27244a925f6d6200.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + The ``NovaHWMachineType`` parameter now defaults to an empty string with + per architecture machine type defaults instead being provided directly by + OpenStack Nova.