From 14c69ac3f074d7cea31687ecc105c015b8a55ec7 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 9 Dec 2018 00:56:13 +0100
Subject: cleanup and imrpovement of vm roles (still not working)

---
 inventory/host_vars/emc-master.yml | 20 ++++++++++----------
 inventory/host_vars/emc-stats.yml  | 20 ++++++++++----------
 inventory/host_vars/emc-test.yml   | 29 +++++++++++++++++++++++++++++
 inventory/host_vars/sk2016.yml     |  1 +
 4 files changed, 50 insertions(+), 20 deletions(-)
 create mode 100644 inventory/host_vars/emc-test.yml

(limited to 'inventory/host_vars')

diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml
index 95b3062a..2a2de27f 100644
--- a/inventory/host_vars/emc-master.yml
+++ b/inventory/host_vars/emc-master.yml
@@ -1,8 +1,8 @@
 ---
-vm_install_host: sk2013
+vm_host: sk2013
 
-vm_install:
-  host: "{{ vm_install_host }}"
+install:
+  host: "{{ vm_host }}"
   mem: 1024
   numcpu: 2
   disks:
@@ -13,20 +13,20 @@ vm_install:
         lv: "{{ inventory_hostname }}"
         size: 42g
   interfaces:
-  - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}"
+  - bridge: "{{ hostvars[vm_host].vm_host.network.interface }}"
     name: primary0
   autostart: True
 
-vm_network:
-  nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}"
+network:
+  nameservers: "{{ hostvars[vm_host].vm_host.network.nameservers }}"
   domain: spreadspace.org
   systemd_link:
-    interfaces: "{{ vm_install.interfaces }}"
+    interfaces: "{{ install.interfaces }}"
   primary:
     interface: primary0
-    ip: "{{ (hostvars[vm_install_host].vm_host.network.ip+'/'+hostvars[vm_install_host].vm_host.network.mask) | ipaddr(hostvars[vm_install_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ hostvars[vm_install_host].vm_host.network.mask }}"
-    gateway: "{{ hostvars[vm_install_host].vm_host.network.gateway | default(hostvars[vm_install_host].vm_host.network.ip) }}"
+    ip: "{{ (hostvars[vm_host].vm_host.network.ip+'/'+hostvars[vm_host].vm_host.network.mask) | ipaddr(hostvars[vm_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}"
+    mask: "{{ hostvars[vm_host].vm_host.network.mask }}"
+    gateway: "{{ hostvars[vm_host].vm_host.network.gateway | default(hostvars[vm_host].vm_host.network.ip) }}"
 
 docker_lvm:
   vg: "{{ inventory_hostname }}"
diff --git a/inventory/host_vars/emc-stats.yml b/inventory/host_vars/emc-stats.yml
index 89352b4f..0bd53559 100644
--- a/inventory/host_vars/emc-stats.yml
+++ b/inventory/host_vars/emc-stats.yml
@@ -1,8 +1,8 @@
 ---
-vm_install_host: sk2016
+vm_host: sk2016
 
-vm_install:
-  host: "{{ vm_install_host }}"
+install:
+  host: "{{ vm_host }}"
   mem: 8192
   numcpu: 6
   disks:
@@ -17,20 +17,20 @@ vm_install:
         lv: "{{ inventory_hostname }}-data"
         size: 100g
   interfaces:
-  - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}"
+  - bridge: "{{ hostvars[vm_host].vm_host.network.interface }}"
     name: primary0
   autostart: True
 
-vm_network:
-  nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}"
+network:
+  nameservers: "{{ hostvars[vm_host].vm_host.network.nameservers }}"
   domain: spreadspace.org
   systemd_link:
-    interfaces: "{{ vm_install.interfaces }}"
+    interfaces: "{{ install.interfaces }}"
   primary:
     interface: primary0
-    ip: "{{ (hostvars[vm_install_host].vm_host.network.ip+'/'+hostvars[vm_install_host].vm_host.network.mask) | ipaddr(hostvars[vm_install_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ hostvars[vm_install_host].vm_host.network.mask }}"
-    gateway: "{{ hostvars[vm_install_host].vm_host.network.gateway | default(hostvars[vm_install_host].vm_host.network.ip) }}"
+    ip: "{{ (hostvars[vm_host].vm_host.network.ip+'/'+hostvars[vm_host].vm_host.network.mask) | ipaddr(hostvars[vm_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}"
+    mask: "{{ hostvars[vm_host].vm_host.network.mask }}"
+    gateway: "{{ hostvars[vm_host].vm_host.network.gateway | default(hostvars[vm_host].vm_host.network.ip) }}"
 
 docker_lvm:
   vg: "{{ inventory_hostname }}"
diff --git a/inventory/host_vars/emc-test.yml b/inventory/host_vars/emc-test.yml
new file mode 100644
index 00000000..9b556df0
--- /dev/null
+++ b/inventory/host_vars/emc-test.yml
@@ -0,0 +1,29 @@
+---
+vm_host: sk2016
+
+install:
+  host: "{{ vm_host }}"
+  mem: 1024
+  numcpu: 2
+  disks:
+    primary: vda
+    virtio:
+      vda:
+        vg: storage
+        lv: "{{ inventory_hostname }}"
+        size: 10g
+  interfaces:
+  - bridge: "{{ hostvars[vm_host].vm_host.network.interface }}"
+    name: primary0
+  autostart: True
+
+network:
+  nameservers: "{{ hostvars[vm_host].vm_host.network.nameservers }}"
+  domain: spreadspace.org
+  systemd_link:
+    interfaces: "{{ install.interfaces }}"
+  primary:
+    interface: primary0
+    ip: "{{ (hostvars[vm_host].vm_host.network.ip+'/'+hostvars[vm_host].vm_host.network.mask) | ipaddr(hostvars[vm_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}"
+    mask: "{{ hostvars[vm_host].vm_host.network.mask }}"
+    gateway: "{{ hostvars[vm_host].vm_host.network.gateway | default(hostvars[vm_host].vm_host.network.ip) }}"
diff --git a/inventory/host_vars/sk2016.yml b/inventory/host_vars/sk2016.yml
index f8371cea..73e59d75 100644
--- a/inventory/host_vars/sk2016.yml
+++ b/inventory/host_vars/sk2016.yml
@@ -17,3 +17,4 @@ vm_host:
     - 213.133.99.99
     indices:
       emc-stats: 200
+      emc-test: 201
-- 
cgit v1.2.3