Merge "Add support for [libvirt] migration_inbound_addr"
This commit is contained in:
commit
98c2f57d0a
|
@ -22,6 +22,10 @@
|
||||||
# (optional) Bind libvirtd tcp/tls socket to the given address.
|
# (optional) Bind libvirtd tcp/tls socket to the given address.
|
||||||
# Defaults to $facts['os_service_default'] (bind to all addresses)
|
# 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*]
|
# [*live_migration_inbound_addr*]
|
||||||
# (optional) The IP address or hostname to be used as the target for live
|
# (optional) The IP address or hostname to be used as the target for live
|
||||||
# migration traffic.
|
# migration traffic.
|
||||||
|
@ -153,6 +157,7 @@ class nova::migration::libvirt(
|
||||||
Enum['tcp', 'tls', 'ssh'] $transport = 'tcp',
|
Enum['tcp', 'tls', 'ssh'] $transport = 'tcp',
|
||||||
Enum['sasl', 'none'] $auth = 'none',
|
Enum['sasl', 'none'] $auth = 'none',
|
||||||
$listen_address = $facts['os_service_default'],
|
$listen_address = $facts['os_service_default'],
|
||||||
|
$migration_inbound_addr = $facts['os_service_default'],
|
||||||
$live_migration_inbound_addr = $facts['os_service_default'],
|
$live_migration_inbound_addr = $facts['os_service_default'],
|
||||||
$live_migration_tunnelled = $facts['os_service_default'],
|
$live_migration_tunnelled = $facts['os_service_default'],
|
||||||
$live_migration_with_native_tls = $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}"
|
$live_migration_uri = "qemu+${transport}://${prefix}%s${postfix}/system${extra_params}"
|
||||||
|
|
||||||
nova_config {
|
nova_config {
|
||||||
|
'libvirt/migration_inbound_addr': value => $migration_inbound_addr;
|
||||||
'libvirt/live_migration_uri': value => $live_migration_uri;
|
'libvirt/live_migration_uri': value => $live_migration_uri;
|
||||||
'libvirt/live_migration_tunnelled': value => $live_migration_tunnelled;
|
'libvirt/live_migration_tunnelled': value => $live_migration_tunnelled;
|
||||||
'libvirt/live_migration_with_native_tls': value => $live_migration_with_native_tls;
|
'libvirt/live_migration_with_native_tls': value => $live_migration_with_native_tls;
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``nova::migration::libvirt::migration_inbound_addr`` parameter has
|
||||||
|
been added.
|
|
@ -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('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('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_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_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_with_native_tls').with_value('<SERVICE DEFAULT>') }
|
||||||
it { is_expected.to contain_nova_config('libvirt/live_migration_downtime').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
|
let :params do
|
||||||
{
|
{
|
||||||
:transport => 'tls',
|
:transport => 'tls',
|
||||||
|
:migration_inbound_addr => 'host2.example.com',
|
||||||
:live_migration_inbound_addr => 'host1.example.com',
|
:live_migration_inbound_addr => 'host1.example.com',
|
||||||
}
|
}
|
||||||
end
|
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('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('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_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_uri').with_value('qemu+tls://%s/system')}
|
||||||
it { is_expected.to contain_nova_config('libvirt/live_migration_inbound_addr').with_value('host1.example.com')}
|
it { is_expected.to contain_nova_config('libvirt/live_migration_inbound_addr').with_value('host1.example.com')}
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue