From 642290c73407a7969857197810123633c83c6a26 Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter
Date: Sun, 13 Feb 2022 01:37:39 +0100
Subject: Bulk update

Signed-off-by: Georg Pfuetzenreuter <georg@lysergic.dev>
---
 ansible/deployment_poc/templates/dhcpd.conf.j2                |  2 +-
 ansible/deployment_poc/templates/grub.j2                      |  3 +++
 .../deployment_poc/templates/libvirt-storage-template.xml.j2  |  4 ++--
 ansible/deployment_poc/templates/libvirt-template.xml.j2      | 11 +++++++----
 ansible/deployment_poc/templates/nsd_zone.j2                  |  1 +
 5 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 ansible/deployment_poc/templates/grub.j2
 create mode 100644 ansible/deployment_poc/templates/nsd_zone.j2

(limited to 'ansible/deployment_poc/templates')

diff --git a/ansible/deployment_poc/templates/dhcpd.conf.j2 b/ansible/deployment_poc/templates/dhcpd.conf.j2
index 5309ae4..fc7a5dd 100644
--- a/ansible/deployment_poc/templates/dhcpd.conf.j2
+++ b/ansible/deployment_poc/templates/dhcpd.conf.j2
@@ -1,5 +1,5 @@
 host {{ vm_name }} {
   hardware ethernet {{ mac_address }};
   fixed-address {{ ip_address }};
-  filename "replace-with-bootfile";
+  filename "shim.efi";
 }
diff --git a/ansible/deployment_poc/templates/grub.j2 b/ansible/deployment_poc/templates/grub.j2
new file mode 100644
index 0000000..ec4d4a0
--- /dev/null
+++ b/ansible/deployment_poc/templates/grub.j2
@@ -0,0 +1,3 @@
+default={% if os == 'openSUSE-Leap-x86_64' %}install-suse{% endif %}{% if os == 'OpenBSD-x86_64' %}install-openbsd{% endif %}
+
+{% if os == 'openSUSE-Leap-x86_64' %}installfile=autoinst_{{ vm_name }}.xml{% endif %}
diff --git a/ansible/deployment_poc/templates/libvirt-storage-template.xml.j2 b/ansible/deployment_poc/templates/libvirt-storage-template.xml.j2
index 9ce3ff1..048dd2a 100644
--- a/ansible/deployment_poc/templates/libvirt-storage-template.xml.j2
+++ b/ansible/deployment_poc/templates/libvirt-storage-template.xml.j2
@@ -8,8 +8,8 @@
     <format type='qcow2'/>
     <permissions>
       <mode>0660</mode>
-      <owner>107</owner>
-      <group>107</group>
+      <owner>455</owner>
+      <group>453</group>
     </permissions>
   </target>
 </volume>
diff --git a/ansible/deployment_poc/templates/libvirt-template.xml.j2 b/ansible/deployment_poc/templates/libvirt-template.xml.j2
index 8c4170d..28826e1 100644
--- a/ansible/deployment_poc/templates/libvirt-template.xml.j2
+++ b/ansible/deployment_poc/templates/libvirt-template.xml.j2
@@ -12,8 +12,11 @@
   </resource>
   <os>
     <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
+    <!--loader readonly='yes' type='pflash'>/opt/firmware/OVMF_09012022_RELEASE_HTTPBOOT.fd</loader-->
     <loader readonly='yes' type='pflash'>/usr/share/qemu/ovmf-x86_64-code.bin</loader>
     <nvram>/var/lib/libvirt/qemu/nvram/{{ inventory_hostname }}_VARS.fd</nvram>
+    <boot dev='hd'/>
+    <boot dev='network'/>
     <bootmenu enable='no'/>
   </os>
   <features>
@@ -57,15 +60,15 @@
   </pm>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <!--disk type='file' device='disk'>
+    <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source file='/mnt/arr1-store1/vmstore1/{{ inventory_hostname }}_root_disk.qcow2' index='2'/>
+      <!--source pool='{{ storage.name }}' volume='{{ inventory_hostname }}_root_disk.qcow2' index='1'/-->
+      <source file='{{ volume_path }}'/>
       <backingStore/>
       <target dev='vda' bus='virtio'/>
-      <boot order='1'/>
       <alias name='virtio-disk0'/>
       <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk-->
+    </disk>
     <!--disk type='file' device='cdrom'>
       <driver name='qemu'/>
       <source file='/mnt/iso/openSUSE-Leap-15.3-NET-x86_64.iso'/>
diff --git a/ansible/deployment_poc/templates/nsd_zone.j2 b/ansible/deployment_poc/templates/nsd_zone.j2
new file mode 100644
index 0000000..ddc44ab
--- /dev/null
+++ b/ansible/deployment_poc/templates/nsd_zone.j2
@@ -0,0 +1 @@
+{{ vm_name }}            IN  A    {{ ip_address }}
-- 
cgit v1.2.3