From 44aa832194181cb425e845f037e4bf502ee5133c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 25 Apr 2022 17:26:54 +0900 Subject: [PATCH] Nova: Use ssh transport for Ubuntu Currently integration jobs in Ubuntu are broken because of an issue with enabling libvirtd socket service. The issue is caused by the policy in Ubuntu packaging that services like libvirt or nova-compute are enabled by default. Until we come up with the solution to workaround the issue, this change switches migration transport from tcp to ssh. Change-Id: I3b1839565f1f0ad80a9eb472d1040803ec574815 (cherry picked from commit 58a60f213e98c082e3baac1c5c2fa4f43e2d8fde) --- manifests/nova.pp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/manifests/nova.pp b/manifests/nova.pp index 08e832152..8d95035c1 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -167,6 +167,18 @@ class openstack_integration::nova ( instance_usage_audit_period => 'hour', } + # NOTE(tkajinam): In Ubuntu, libvirtd-tcp.socket fails to start because of + # libvirtd.service running, though we stop the service in + # puppet-nova. Until we fix the failure, use ssh transport + # which does not require socket services. + $migration_transport = $::osfamily ? { + 'Debian' => 'ssh', + default => 'tcp' + } + class { 'nova::migration::libvirt': + transport => $migration_transport + } + $images_type = $libvirt_rbd ? { true => 'rbd', false => $::os_service_default @@ -174,7 +186,6 @@ class openstack_integration::nova ( class { 'nova::compute::libvirt': virt_type => $libvirt_virt_type, cpu_mode => $libvirt_cpu_mode, - migration_support => true, # virtlock and virtlog services resources are not idempotent # on Ubuntu, let's disable it for now. # https://tickets.puppetlabs.com/browse/PUP-6370