From 9faea7204ca56561a92b45426fc8047e5b48fe61 Mon Sep 17 00:00:00 2001 From: Oliver Walsh Date: Thu, 19 Apr 2018 21:09:20 +0100 Subject: [PATCH] Set live_migration_inbound_addr for ssh transport Currently this is only set when TLS is enabled, which means that with the ssh transport we cannot control the network used, and we are relying on DNS or hosts file to be correct, which is not guaranteed (especially with DNS). Related-Bug: 1765462 Depends-On: Ifdc5fbd05195604ab6ea6564d0905f9385c6df67 Change-Id: I89011d06233dafb5ca3bbb45431387ebda521711 --- puppet/services/nova-libvirt.yaml | 8 +++++++- ...ion_inbound_addr_all_transports-2fc9cd74d435a367.yaml | 9 +++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/live_migration_inbound_addr_all_transports-2fc9cd74d435a367.yaml diff --git a/puppet/services/nova-libvirt.yaml b/puppet/services/nova-libvirt.yaml index f777f55dcd..c88d6e0b70 100644 --- a/puppet/services/nova-libvirt.yaml +++ b/puppet/services/nova-libvirt.yaml @@ -276,7 +276,13 @@ outputs: template: "libvirt/%{hiera('fqdn_NETWORK')}" params: NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]} - - {} + - + nova::migration::libvirt::live_migration_inbound_addr: + str_replace: + template: + "%{hiera('$NETWORK')}" + params: + $NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]} - if: - use_tls_for_vnc diff --git a/releasenotes/notes/live_migration_inbound_addr_all_transports-2fc9cd74d435a367.yaml b/releasenotes/notes/live_migration_inbound_addr_all_transports-2fc9cd74d435a367.yaml new file mode 100644 index 0000000000..6b0f22e141 --- /dev/null +++ b/releasenotes/notes/live_migration_inbound_addr_all_transports-2fc9cd74d435a367.yaml @@ -0,0 +1,9 @@ +--- +fixes: + - | + Set live_migration_inbound_addr for ssh transport + + Previously this was only set when TLS is enabled, which means that with the ssh + transport we could not control the network used, and were relying on DNS or + hosts file to be correct, which is not guaranteed (especially with DNS). +