From b01e63ba531b0bd7853469a33a85f06457c84410 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 8 Dec 2018 15:08:12 +0100
Subject: strip old and not yet used hosts

---
 host_playbooks/elesearch.yml      |  9 ---------
 inventory/host_vars/elesearch.yml | 29 -----------------------------
 inventory/host_vars/sk2013.yml    |  1 -
 inventory/hosts.ini               | 26 +++++++++++---------------
 4 files changed, 11 insertions(+), 54 deletions(-)
 delete mode 100644 host_playbooks/elesearch.yml
 delete mode 100644 inventory/host_vars/elesearch.yml

diff --git a/host_playbooks/elesearch.yml b/host_playbooks/elesearch.yml
deleted file mode 100644
index 15fca1a7..00000000
--- a/host_playbooks/elesearch.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Basic Setup
-  hosts: elesearch
-  roles:
-  - role: sshserver
-  - role: vm/grub
-  - role: vm/network
-  - role: base
-  - role: zsh
diff --git a/inventory/host_vars/elesearch.yml b/inventory/host_vars/elesearch.yml
deleted file mode 100644
index 0e235000..00000000
--- a/inventory/host_vars/elesearch.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-vm_install_host: sk2013
-
-vm_install:
-  host: "{{ vm_install_host }}"
-  mem: 1024
-  numcpu: 4
-  disks:
-    primary: vda
-    virtio:
-      vda:
-        vg: storage
-        lv: "{{ inventory_hostname }}"
-        size: 50g
-  interfaces:
-  - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}"
-    name: primary0
-  autostart: True
-
-vm_network:
-  nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}"
-  domain: elevate.at
-  systemd_link:
-    interfaces: "{{ vm_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) }}"
diff --git a/inventory/host_vars/sk2013.yml b/inventory/host_vars/sk2013.yml
index a8bb3ebd..c1bf2728 100644
--- a/inventory/host_vars/sk2013.yml
+++ b/inventory/host_vars/sk2013.yml
@@ -17,4 +17,3 @@ vm_host:
     - 213.133.99.99
     indices:
       emc-master: 141
-      elesearch: 142
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index bbb04855..37f8fc9b 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -11,17 +11,14 @@ host_name={{ inventory_hostname }}
 [chaos-at-home:vars]
 host_domain=chaos-at-home.org
 environment_group=chaos-at-home
+ansible_host={{ host_name }}.{{ host_domain }}
+ansible_user=root
+ansible_port=22000
 
 [chaos-at-home]
-prometheus
-web
-mail
-stats
-auth
+#prometheus
 atlas
-pan ansible_port=222
 keyserver
-mimas
 
 
 ###############################
@@ -30,6 +27,9 @@ mimas
 [spreadspace:vars]
 host_domain=spreadspace.org
 environment_group=spreadspace
+ansible_host={{ host_name }}.{{ host_domain }}
+ansible_user=root
+ansible_port=22000
 
 [spreadspace]
 build
@@ -41,8 +41,9 @@ helene
 emc-test
 
 
-[spreadspace:children]
-emc
+[emc:vars]
+host_domain=spreadspace.org
+environment_group=spreadspace
 
 [emc]
 emc-stats
@@ -73,16 +74,14 @@ host_domain=elevate.at
 environment_group=dan
 
 [elevate]
-elewolke host_name=wolke
 elemedia host_name=media
-elesearch host_name=search
 
 
 ###############################
 # host categories
 
 [kvmhosts]
-prometheus
+#prometheus
 atlas
 sk2013
 sk2016
@@ -92,9 +91,6 @@ sk2013
 sk2016
 emc-stats
 emc-master
-mimas
-elewolke
-elesearch
 
 [hetzner:children]
 emc-xx
-- 
cgit v1.2.3