From e97c53dcfa23926e140dcc5793a0c67a4d653371 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 29 Sep 2019 22:31:37 +0200
Subject: sk-2019vm can run machines now

---
 roles/vm/define/templates/libvirt-domain.xml.j2 | 4 ++--
 roles/vm/host/tasks/network.yml                 | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'roles/vm')

diff --git a/roles/vm/define/templates/libvirt-domain.xml.j2 b/roles/vm/define/templates/libvirt-domain.xml.j2
index 59037fd9..426d4323 100644
--- a/roles/vm/define/templates/libvirt-domain.xml.j2
+++ b/roles/vm/define/templates/libvirt-domain.xml.j2
@@ -42,7 +42,7 @@
 {%     if src.type == 'lvm' %}
       <source dev='/dev/mapper/{{ src.vg | replace('-', '--') }}-{{ src.lv | replace('-', '--') }}'/>
 {%     elif src.type == 'zfs' %}
-      <source dev='/dev/zvol/{{ srv.pool }}/{{ srv.name }}'/>
+      <source dev='/dev/zvol/{{ src.pool }}/{{ src.name }}'/>
 {%     endif %}
       <target dev='{{ device }}' bus='virtio'/>
     </disk>
@@ -57,7 +57,7 @@
 {%     if src.type == 'lvm' %}
       <source dev='/dev/mapper/{{ src.vg | replace('-', '--') }}-{{ src.lv | replace('-', '--') }}'/>
 {%     elif src.type == 'zfs' %}
-      <source dev='/dev/zvol/{{ srv.pool }}/{{ srv.name }}'/>
+      <source dev='/dev/zvol/{{ src.pool }}/{{ src.name }}'/>
 {%     endif %}
       <target dev='{{ device }}' bus='scsi'/>
     </disk>
diff --git a/roles/vm/host/tasks/network.yml b/roles/vm/host/tasks/network.yml
index d3d2edf2..7ce3de45 100644
--- a/roles/vm/host/tasks/network.yml
+++ b/roles/vm/host/tasks/network.yml
@@ -6,8 +6,8 @@
     content: |
       auto {{ vm_host.network.interface }}
       iface {{ vm_host.network.interface }} inet static
-        address {{ vm_host.network.ip }}
-        netmask {{ vm_host.network.mask }}
+        address {{ vm_host.network.prefix | ipaddr('address') }}
+        netmask {{ vm_host.network.prefix | ipaddr('netmask') }}
         bridge_ports none
         bridge_stp off
         bridge_waitport 0
@@ -19,8 +19,8 @@
         up /sbin/sysctl net.bridge.bridge-nf-call-ip6tables=0
         up /sbin/sysctl net.bridge.bridge-nf-call-arptables=0
       {% if 'nat' in vm_host.network and vm_host.network.nat %}
-        up /usr/sbin/iptables -t nat -A POSTROUTING -o {{ ansible_default_ipv4.interface }} -s {{ (vm_host.network.ip + '/' + vm_host.network.mask) | ipaddr('network/prefix') }} -j SNAT --to {{ ansible_default_ipv4.address }}
-        down /usr/sbin/iptables -t nat -D POSTROUTING -o {{ ansible_default_ipv4.interface }} -s {{ (vm_host.network.ip + '/' + vm_host.network.mask) | ipaddr('network/prefix') }} -j SNAT --to {{ ansible_default_ipv4.address }}
+        up /usr/sbin/iptables -t nat -A POSTROUTING -o {{ ansible_default_ipv4.interface }} -s {{ vm_host.network.prefix | ipaddr('network/prefix') }} -j SNAT --to {{ ansible_default_ipv4.address }}
+        down /usr/sbin/iptables -t nat -D POSTROUTING -o {{ ansible_default_ipv4.interface }} -s {{ vm_host.network.prefix | ipaddr('network/prefix') }} -j SNAT --to {{ ansible_default_ipv4.address }}
       {% endif %}
   register: vmhost_interface_config
 
-- 
cgit v1.2.3