openstack
/
puppet-nova
Code Issues Proposed changes

Add support for [libvirt] migration_inbound_addr 

... which was added during this cycle.

Depends-on: https://review.opendev.org/c/openstack/nova/+/900203

Change-Id: Ie10d50014ce431af4c6cc27e39441e789690fd16
This commit is contained in:
Takashi Kajinami 2024-01-12 18:16:38 +09:00
parent 27f6b3a433
commit 487b45ca18
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/migration/libvirt.pp
View File

@ -22,6 +22,10 @@
# (optional) Bind libvirtd tcp/tls socket to the given address.
# Defaults to $facts['os_service_default'] (bind to all addresses)
#
# [*migration_inbound_addr*]
# (optional) The address used as the migration address for this host.
# Defaults to $facts['os_service_default']
#
# [*live_migration_inbound_addr*]
# (optional) The IP address or hostname to be used as the target for live
# migration traffic.
@ -153,6 +157,7 @@ class nova::migration::libvirt(
Enum['tcp', 'tls', 'ssh'] $transport = 'tcp',
Enum['sasl', 'none'] $auth = 'none',
$listen_address = $facts['os_service_default'],
$migration_inbound_addr = $facts['os_service_default'],
$live_migration_inbound_addr = $facts['os_service_default'],
$live_migration_tunnelled = $facts['os_service_default'],
$live_migration_with_native_tls = $facts['os_service_default'],
@ -213,6 +218,7 @@ class nova::migration::libvirt(
$live_migration_uri = "qemu+${transport}://${prefix}%s${postfix}/system${extra_params}"
nova_config {
'libvirt/migration_inbound_addr': value => $migration_inbound_addr;
'libvirt/live_migration_uri': value => $live_migration_uri;
'libvirt/live_migration_tunnelled': value => $live_migration_tunnelled;
'libvirt/live_migration_with_native_tls': value => $live_migration_with_native_tls;

5
releasenotes/notes/migration_inbound_addr-2a6ee64ed0cc20b5.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``nova::migration::libvirt::migration_inbound_addr`` parameter has
been added.

3
spec/classes/nova_migration_libvirt_spec.rb
View File

@ -37,6 +37,7 @@ describe 'nova::migration::libvirt' do
it { is_expected.to contain_libvirtd_config('auth_tcp').with_value('none').with_quote(true) }
it { is_expected.to contain_libvirtd_config('ca_file').with_value('<SERVICE DEFAULT>').with_quote(true) }
it { is_expected.to contain_libvirtd_config('crl_file').with_value('<SERVICE DEFAULT>').with_quote(true) }
it { is_expected.to contain_nova_config('libvirt/migration_inbound_addr').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/live_migration_tunnelled').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('libvirt/live_migration_with_native_tls').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('libvirt/live_migration_downtime').with_value('<SERVICE DEFAULT>') }
@ -96,6 +97,7 @@ describe 'nova::migration::libvirt' do
let :params do
{
:transport => 'tls',
:migration_inbound_addr => 'host2.example.com',
:live_migration_inbound_addr => 'host1.example.com',
}
end
@ -103,6 +105,7 @@ describe 'nova::migration::libvirt' do
it { is_expected.to contain_libvirtd_config('auth_tcp').with_value('<SERVICE DEFAULT>').with_quote(true) }
it { is_expected.to contain_libvirtd_config('ca_file').with_value('<SERVICE DEFAULT>').with_quote(true) }
it { is_expected.to contain_libvirtd_config('crl_file').with_value('<SERVICE DEFAULT>').with_quote(true) }
it { is_expected.to contain_nova_config('libvirt/migration_inbound_addr').with_value('host2.example.com')}
it { is_expected.to contain_nova_config('libvirt/live_migration_uri').with_value('qemu+tls://%s/system')}
it { is_expected.to contain_nova_config('libvirt/live_migration_inbound_addr').with_value('host1.example.com')}
end