From 1b1c72a9ea3a75bf88bc04ae9a5e791a7e05b17b Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 26 Jun 2022 18:16:58 +0900
Subject: [PATCH] Disable the default libvirt network

... using the new class added to the puppet-nova, because it is not
required in OpenStack deployment.

Depends-on: https://review.opendev.org/847677
Change-Id: Ic538ec9d9758ef70e3edd852bfbbcf42f3a4dc1a
---
 copy_logs.sh      | 1 +
 manifests/nova.pp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/copy_logs.sh b/copy_logs.sh
index a2e939c36..a794e4d79 100755
--- a/copy_logs.sh
+++ b/copy_logs.sh
@@ -151,6 +151,7 @@ fi
 # libvirt
 if [ -d /var/log/libvirt ] ; then
     sudo cp -r /var/log/libvirt $LOG_DIR/
+    sudo virsh net-list --all > $LOG_DIR/virsh-net-list.txt
 fi
 if [ -d /etc/libvirt ]; then
     sudo cp -r /etc/libvirt $LOG_DIR/etc/
diff --git a/manifests/nova.pp b/manifests/nova.pp
index 8d95035c1..fca3ed54a 100644
--- a/manifests/nova.pp
+++ b/manifests/nova.pp
@@ -193,6 +193,7 @@ class openstack_integration::nova (
     virtlog_service_name  => false,
     images_type           => $images_type,
   }
+  class { 'nova::compute::libvirt::networks': }
   if $libvirt_rbd {
     class { 'nova::compute::rbd':
       libvirt_rbd_user        => 'openstack',