From 3939aebb24ac02e60474bffb135f55ba6bd6faa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Wed, 16 Feb 2022 11:55:22 +0100
Subject: [PATCH] Fix "kvm: Drop ipv4-network-info"
As refernce to the network-config-ipv4 part has been removed from the
publish-connection-information the part was not installed anymore, so the
netconfig.sh file was not added.
Fixed it by simply adding this part to the installed ones.
This fixes commit 3f7d89652d74eba3047e491c2d0fe39fed401a58
---
software/kvm/buildout.hash.cfg | 2 +-
software/kvm/instance-kvm.cfg.jinja2 | 1 +
software/kvm/test/test.py | 6 ++++++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/software/kvm/buildout.hash.cfg b/software/kvm/buildout.hash.cfg
index bc0932df2..d0f124f00 100644
--- a/software/kvm/buildout.hash.cfg
+++ b/software/kvm/buildout.hash.cfg
@@ -19,7 +19,7 @@ md5sum = 087f226ba90928dcc5a722d7008c867a
[template-kvm]
filename = instance-kvm.cfg.jinja2
-md5sum = d949e6100fd4e01819cc2867a65c6e65
+md5sum = baa3ee5b653731124bfc2ac2fa835787
[template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in
diff --git a/software/kvm/instance-kvm.cfg.jinja2 b/software/kvm/instance-kvm.cfg.jinja2
index 56285f55c..26134064b 100644
--- a/software/kvm/instance-kvm.cfg.jinja2
+++ b/software/kvm/instance-kvm.cfg.jinja2
@@ -879,6 +879,7 @@ ipv6-network-info =
{% if use_tap and slap_configuration.get('tap-ipv4-addr') -%}
+{% do part_list.append('network-config-ipv4') %}
[network-config-ipv4]
recipe = plone.recipe.command
filename = netconfig.sh
diff --git a/software/kvm/test/test.py b/software/kvm/test/test.py
index f74f261d0..2d9b82a5d 100644
--- a/software/kvm/test/test.py
+++ b/software/kvm/test/test.py
@@ -443,6 +443,12 @@ class TestAccessDefaultBootstrap(MonitorAccessMixin, InstanceTestCase):
result.status_code
)
self.assertIn('<title>noVNC</title>', result.text)
+ # check that expected files to configure the VM are exposed by the instance
+ self.assertEqual(
+ ['delDefaultIface', 'netconfig.sh'],
+ sorted(os.listdir(os.path.join(
+ self.computer_partition_root_path, 'srv', 'public')))
+ )
@skipUnlessKvm
--
2.30.9