Merge "Revert "Fix live-migration with libvirt >= 6.8.0""

This commit is contained in:
Zuul 2022-07-13 20:57:36 +00:00 committed by Gerrit Code Review
commit fc31c803b4
2 changed files with 15 additions and 4 deletions

View File

@ -70,10 +70,7 @@ class tripleo::profile::base::nova::migration::client (
configure_libvirt => $libvirt_enabled,
configure_nova => $nova_compute_enabled,
client_user => 'nova_migration',
client_extraparams => {
'keyfile' => '/etc/nova/migration/identity',
'proxy' => 'netcat',
},
client_extraparams => {'keyfile' => '/etc/nova/migration/identity'},
client_port => $ssh_port
}
}

View File

@ -0,0 +1,14 @@
---
upgrade:
- |
When support for CentOS stream 9 and rhel 9 was being developed the
nova migration wrapper script in the RDO distgit repo did not support
the virt-ssh-helper command for live migration. To work around that
the netcat proxy was hardcoded in 04a97f92e4d944ce51492011584e2ec1126042a1.
Since then the nova-distgit repo has been updated with support for
virt-ssh-helper and netcat has been removed from the nova live migration
target container. As a result its not currently possible to live migrate
with rhel9 images As reported in `bugzilla 2089520`_. To support upgrades
this has now been reverted and we no longer hardcode the proxy to netcat.
.. _`bugzilla 2089520`: https://bugzilla.redhat.com/show_bug.cgi?id=2089520