From 7a846cdbcf6a66cc0cc529613272b74579a517dc Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Mon, 29 Jun 2020 22:46:07 +0200
Subject: minor improvment for vm resource config

---
 inventory/host_vars/ch-gw-lan.yml               | 4 ++--
 inventory/host_vars/ch-hroottest-obsd.yml       | 4 ++--
 inventory/host_vars/ch-hroottest-vm1.yml        | 4 ++--
 inventory/host_vars/ch-jump.yml                 | 4 ++--
 inventory/host_vars/ch-k8s-m0.yml               | 4 ++--
 inventory/host_vars/ch-k8s-m1.yml               | 4 ++--
 inventory/host_vars/ch-k8s-m2.yml               | 4 ++--
 inventory/host_vars/ch-k8s-w0.yml               | 4 ++--
 inventory/host_vars/ch-k8s-w1.yml               | 4 ++--
 inventory/host_vars/ch-keyserver.yml            | 4 ++--
 inventory/host_vars/ch-mimas.yml                | 4 ++--
 inventory/host_vars/ch-nic.yml                  | 4 ++--
 inventory/host_vars/ch-router-obsd.yml          | 4 ++--
 inventory/host_vars/ch-testvm.yml               | 4 ++--
 inventory/host_vars/ele-gwhetzner.yml           | 4 ++--
 inventory/host_vars/ele-mur.yml                 | 4 ++--
 inventory/host_vars/emc-master.yml              | 4 ++--
 inventory/host_vars/lw-master.yml               | 4 ++--
 inventory/host_vars/r3-vex2.yml                 | 4 ++--
 inventory/host_vars/sk-testvm.yml               | 4 ++--
 inventory/host_vars/sk-tomnext-hp.yml           | 4 ++--
 inventory/host_vars/sk-tomnext-nc.yml           | 4 ++--
 inventory/host_vars/sk-torrent.yml              | 4 ++--
 roles/vm/define/templates/libvirt-domain.xml.j2 | 6 +++---
 24 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/inventory/host_vars/ch-gw-lan.yml b/inventory/host_vars/ch-gw-lan.yml
index 35f98291..be092c15 100644
--- a/inventory/host_vars/ch-gw-lan.yml
+++ b/inventory/host_vars/ch-gw-lan.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 512
-    numcpu: 2
+    memory: 512M
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-hroottest-obsd.yml b/inventory/host_vars/ch-hroottest-obsd.yml
index f7d5cba7..96ec2fe2 100644
--- a/inventory/host_vars/ch-hroottest-obsd.yml
+++ b/inventory/host_vars/ch-hroottest-obsd.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 1024
-    numcpu: 1
+    memory: 1G
+    numcpus: 1
     autostart: True
   disks:
     primary: /dev/vda
diff --git a/inventory/host_vars/ch-hroottest-vm1.yml b/inventory/host_vars/ch-hroottest-vm1.yml
index 4f9e7e82..a7f45252 100644
--- a/inventory/host_vars/ch-hroottest-vm1.yml
+++ b/inventory/host_vars/ch-hroottest-vm1.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 4096
-    numcpu: 4
+    memory: 4G
+    numcpus: 4
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-jump.yml b/inventory/host_vars/ch-jump.yml
index 954819ba..e61cad17 100644
--- a/inventory/host_vars/ch-jump.yml
+++ b/inventory/host_vars/ch-jump.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 768
-    numcpu: 2
+    memory: 768M
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-k8s-m0.yml b/inventory/host_vars/ch-k8s-m0.yml
index dc42824f..7d81b792 100644
--- a/inventory/host_vars/ch-k8s-m0.yml
+++ b/inventory/host_vars/ch-k8s-m0.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 4096
-    numcpu: 2
+    memory: 4G
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-k8s-m1.yml b/inventory/host_vars/ch-k8s-m1.yml
index dc42824f..7d81b792 100644
--- a/inventory/host_vars/ch-k8s-m1.yml
+++ b/inventory/host_vars/ch-k8s-m1.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 4096
-    numcpu: 2
+    memory: 4G
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-k8s-m2.yml b/inventory/host_vars/ch-k8s-m2.yml
index da9fbe18..6de6fbfb 100644
--- a/inventory/host_vars/ch-k8s-m2.yml
+++ b/inventory/host_vars/ch-k8s-m2.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 4096
-    numcpu: 2
+    memory: 4G
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-k8s-w0.yml b/inventory/host_vars/ch-k8s-w0.yml
index 979efc24..51095a86 100644
--- a/inventory/host_vars/ch-k8s-w0.yml
+++ b/inventory/host_vars/ch-k8s-w0.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 4096
-    numcpu: 4
+    memory: 4G
+    numcpus: 4
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-k8s-w1.yml b/inventory/host_vars/ch-k8s-w1.yml
index 979efc24..51095a86 100644
--- a/inventory/host_vars/ch-k8s-w1.yml
+++ b/inventory/host_vars/ch-k8s-w1.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 4096
-    numcpu: 4
+    memory: 4G
+    numcpus: 4
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-keyserver.yml b/inventory/host_vars/ch-keyserver.yml
index 60ab034b..131da209 100644
--- a/inventory/host_vars/ch-keyserver.yml
+++ b/inventory/host_vars/ch-keyserver.yml
@@ -3,8 +3,8 @@ apt_repo_provider: ffgraz
 
 install:
   vm:
-    mem: 2048
-    numcpu: 2
+    memory: 2G
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-mimas.yml b/inventory/host_vars/ch-mimas.yml
index dfec3866..38422a30 100644
--- a/inventory/host_vars/ch-mimas.yml
+++ b/inventory/host_vars/ch-mimas.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 2048
-    numcpu: 4
+    memory: 2G
+    numcpus: 4
     autostart: True
   disks:
     primary: /dev/vda
diff --git a/inventory/host_vars/ch-nic.yml b/inventory/host_vars/ch-nic.yml
index d26b1c40..60c68f57 100644
--- a/inventory/host_vars/ch-nic.yml
+++ b/inventory/host_vars/ch-nic.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 768
-    numcpu: 2
+    memory: 768M
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-router-obsd.yml b/inventory/host_vars/ch-router-obsd.yml
index 71137da1..74ecb75b 100644
--- a/inventory/host_vars/ch-router-obsd.yml
+++ b/inventory/host_vars/ch-router-obsd.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 512
-    numcpu: 1
+    memory: 512M
+    numcpus: 1
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-testvm.yml b/inventory/host_vars/ch-testvm.yml
index 5b5e465e..7f74a891 100644
--- a/inventory/host_vars/ch-testvm.yml
+++ b/inventory/host_vars/ch-testvm.yml
@@ -3,8 +3,8 @@ apt_repo_provider: ffgraz
 
 install:
   vm:
-    mem: 1024
-    numcpu: 1
+    memory: 1G
+    numcpus: 1
     autostart: False
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ele-gwhetzner.yml b/inventory/host_vars/ele-gwhetzner.yml
index d349ddcc..3be84fd7 100644
--- a/inventory/host_vars/ele-gwhetzner.yml
+++ b/inventory/host_vars/ele-gwhetzner.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 1024
-    numcpu: 1
+    memory: 1G
+    numcpus: 1
     autostart: False
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ele-mur.yml b/inventory/host_vars/ele-mur.yml
index b7d4d38e..3ee20fa4 100644
--- a/inventory/host_vars/ele-mur.yml
+++ b/inventory/host_vars/ele-mur.yml
@@ -7,8 +7,8 @@ apt_repo_provider: ffgraz
 
 install:
   vm:
-    mem: 1024
-    numcpu: 1
+    memory: 1G
+    numcpus: 1
     autostart: False
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml
index 8005b9d9..dcf51a45 100644
--- a/inventory/host_vars/emc-master.yml
+++ b/inventory/host_vars/emc-master.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 10240
-    numcpu: 6
+    memory: 10G
+    numcpus: 6
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/lw-master.yml b/inventory/host_vars/lw-master.yml
index 8005b9d9..dcf51a45 100644
--- a/inventory/host_vars/lw-master.yml
+++ b/inventory/host_vars/lw-master.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 10240
-    numcpu: 6
+    memory: 10G
+    numcpus: 6
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/r3-vex2.yml b/inventory/host_vars/r3-vex2.yml
index d5471743..bf602568 100644
--- a/inventory/host_vars/r3-vex2.yml
+++ b/inventory/host_vars/r3-vex2.yml
@@ -3,8 +3,8 @@ apt_repo_provider: ffgraz
 
 install:
   vm:
-    mem: 2048
-    numcpu: 2
+    memory: 2G
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/sk-testvm.yml b/inventory/host_vars/sk-testvm.yml
index 63538708..cad79e49 100644
--- a/inventory/host_vars/sk-testvm.yml
+++ b/inventory/host_vars/sk-testvm.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 1024
-    numcpu: 1
+    memory: 1G
+    numcpus: 1
     autostart: False
   disks:
     primary: software-raid
diff --git a/inventory/host_vars/sk-tomnext-hp.yml b/inventory/host_vars/sk-tomnext-hp.yml
index 2db59ed3..8975e5a3 100644
--- a/inventory/host_vars/sk-tomnext-hp.yml
+++ b/inventory/host_vars/sk-tomnext-hp.yml
@@ -6,8 +6,8 @@ ssh_users_root:
 
 install:
   vm:
-    mem: 8192
-    numcpu: 4
+    memory: 8G
+    numcpus: 4
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml
index 9b041b62..340795eb 100644
--- a/inventory/host_vars/sk-tomnext-nc.yml
+++ b/inventory/host_vars/sk-tomnext-nc.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 16384
-    numcpu: 8
+    memory: 16G
+    numcpus: 8
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/sk-torrent.yml b/inventory/host_vars/sk-torrent.yml
index 96ddfc4f..c8967dab 100644
--- a/inventory/host_vars/sk-torrent.yml
+++ b/inventory/host_vars/sk-torrent.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 4096
-    numcpu: 4
+    memory: 4G
+    numcpus: 4
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/roles/vm/define/templates/libvirt-domain.xml.j2 b/roles/vm/define/templates/libvirt-domain.xml.j2
index be2fd8b4..c4c9e52a 100644
--- a/roles/vm/define/templates/libvirt-domain.xml.j2
+++ b/roles/vm/define/templates/libvirt-domain.xml.j2
@@ -1,8 +1,8 @@
 <domain type='kvm'>
   <name>{{ install_hostname }}</name>
-  <memory>{{ hostvars[install_hostname].install_cooked.vm.mem * 1024 }}</memory>
-  <currentMemory>{{ hostvars[install_hostname].install_cooked.vm.mem * 1024 }}</currentMemory>
-  <vcpu>{{ hostvars[install_hostname].install_cooked.vm.numcpu }}</vcpu>
+  <memory>{{ ((hostvars[install_hostname].install_cooked.vm.memory | human_to_bytes) / 1024) | int }}</memory>
+  <currentMemory>{{ ((hostvars[install_hostname].install_cooked.vm.memory | human_to_bytes) / 1024) | int }}</currentMemory>
+  <vcpu>{{ hostvars[install_hostname].install_cooked.vm.numcpus }}</vcpu>
   <os>
     <type arch='x86_64' machine='pc-0.12'>hvm</type>
 {% if vm_define_installer %}
-- 
cgit v1.2.3