From 6112dc229f41e460b9ccfb38be23e42cbaebbf84 Mon Sep 17 00:00:00 2001
From: Alain Takoudjou <alain.takoudjou@nexedi.com>
Date: Fri, 11 Jan 2019 13:47:57 +0100
Subject: [PATCH] kvm: fixup after commit 7b399f95
---
software/kvm/instance-kvm.cfg.jinja2 | 3 ++-
software/kvm/software.cfg | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/software/kvm/instance-kvm.cfg.jinja2 b/software/kvm/instance-kvm.cfg.jinja2
index a57f8ddc0..9ceca087e 100644
--- a/software/kvm/instance-kvm.cfg.jinja2
+++ b/software/kvm/instance-kvm.cfg.jinja2
@@ -70,6 +70,7 @@ socket-path = ${directory:var}/qmp_socket
pid-file = ${directory:run}/pid_file
kvm-status-path = ${directory:var}/qemu-vm-is-ready
cpu-count = ${slap-parameter:cpu-count}
+cpu-model = ${slap-parameter:cpu-model}
ram-hotplug-slot-size = ${slap-parameter:ram-hotplug-slot-size}
ram-size = ${slap-parameter:ram-size}
enable-device-hotplug = ${slap-parameter:enable-device-hotplug}
@@ -557,7 +558,7 @@ mode = {{ mode }}
recipe = plone.recipe.command
name = {{ slapparameter_dict.get('name', 'localhost') }}
{% if use_tap == 'true' and slap_configuration.get('tap-ipv4-addr', '') != "" -%}
-local-ipv4 = {{ slap_configuration('tap-ipv4-addr') }}
+local-ipv4 = {{ slap_configuration['tap-ipv4-addr'] }}
gateway = {{ slap_configuration.get('tap-ipv4-gateway') }}
netmask = {{ slap_configuration.get('tap-ipv4-network') }}
network = {{ slap_configuration.get('tap-ipv4-netmask') }}
diff --git a/software/kvm/software.cfg b/software/kvm/software.cfg
index a01dee6e0..a69fad094 100644
--- a/software/kvm/software.cfg
+++ b/software/kvm/software.cfg
@@ -99,7 +99,7 @@ recipe = hexagonit.recipe.download
ignore-existing = true
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
mode = 644
-md5sum = 8ad61964dc1f6df9c7503d67f629bb9e
+md5sum = 1c58191b69c3e140dd9700e86195650a
download-only = true
on-update = true
--
2.30.9