10 files changed, 14 insertions, 17 deletions
diff --git a/chaos-at-home/ch-ap.yml b/chaos-at-home/ch-ap.yml
index 9f2d442e..085b40c3 100644
--- a/chaos-at-home/ch-ap.yml
+++ b/chaos-at-home/ch-ap.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: chaos_at_home_ap
+- hosts: chaos-at-home-ap
   connection: local
   roles:
     - role: openwrt/image
diff --git a/chaos-at-home/group_vars/chaos_at_home_switches.yml b/chaos-at-home/group_vars/chaos-at-home-switches.yml
index 6284dd58..6284dd58 100644
--- a/chaos-at-home/group_vars/chaos_at_home_switches.yml
+++ b/chaos-at-home/group_vars/chaos-at-home-switches.yml
diff --git a/chaos-at-home/group_vars/chaos_at_home_vpn_extern.yml b/chaos-at-home/group_vars/chaos-at-home-vpn-extern.yml
index 89fcd8a6..89fcd8a6 100644
--- a/chaos-at-home/group_vars/chaos_at_home_vpn_extern.yml
+++ b/chaos-at-home/group_vars/chaos-at-home-vpn-extern.yml
diff --git a/chaos-at-home/group_vars/chaos_at_home.yml b/chaos-at-home/group_vars/chaos-at-home.yml
index 8fe4c3f3..8fe4c3f3 100644
--- a/chaos-at-home/group_vars/chaos_at_home.yml
+++ b/chaos-at-home/group_vars/chaos-at-home.yml
diff --git a/inventory/group_vars/chaos_at_home_ap/main.yml b/inventory/group_vars/chaos-at-home-ap/main.yml
index eb05dfad..eb05dfad 100644
--- a/inventory/group_vars/chaos_at_home_ap/main.yml
+++ b/inventory/group_vars/chaos-at-home-ap/main.yml
diff --git a/inventory/group_vars/chaos_at_home_switches/main.yml b/inventory/group_vars/chaos-at-home-switches/main.yml
index fb72c9b1..fb72c9b1 100644
--- a/inventory/group_vars/chaos_at_home_switches/main.yml
+++ b/inventory/group_vars/chaos-at-home-switches/main.yml
diff --git a/inventory/group_vars/chaos_at_home_vpn_extern/main.yml b/inventory/group_vars/chaos-at-home-vpn-extern/main.yml
index 2ada0a35..2ada0a35 100644
--- a/inventory/group_vars/chaos_at_home_vpn_extern/main.yml
+++ b/inventory/group_vars/chaos-at-home-vpn-extern/main.yml
diff --git a/inventory/group_vars/chaos_at_home/main.yml b/inventory/group_vars/chaos-at-home/main.yml
index 1d44eb7d..1d44eb7d 100644
--- a/inventory/group_vars/chaos_at_home/main.yml
+++ b/inventory/group_vars/chaos-at-home/main.yml
diff --git a/inventory/group_vars/chaos_at_home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index d5e93a5f..d5e93a5f 100644
--- a/inventory/group_vars/chaos_at_home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 8f7c92ba..bf2c0fb3 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -1,6 +1,5 @@
 [all:vars]
 host_name={{ inventory_hostname }}
-#ansible_host={{ host_name }}.{{ host_domain }}
 ansible_user=root
 ansible_port=22000
 
@@ -8,13 +7,12 @@ ansible_port=22000
 ###############################
 # environment: chaos-at-home
 
-[chaos_at_home:vars]
+[chaos-at-home:vars]
 host_domain=chaos-at-home.org
 env_group=chaos-at-home
-#ansible_host={{ host_name }}.{{ host_domain }}
 ansible_port=222
 
-[chaos_at_home]
+[chaos-at-home]
 ch-atlas host_name=atlas
 ch-pan host_name=pan
 ch-keyserver host_name=keyserver
@@ -24,28 +22,28 @@ ch-router host_name=router
 ch-gw-lan host_name=gw-lan
 ch-jump host_name=jump ansible_port=2342 ansible_host=ch-jump
 
-[chaos_at_home:children]
-mz_chaos_at_home
-chaos_at_home_switches
-chaos_at_home_ap
+[chaos-at-home:children]
+mz-chaos-at-home
+chaos-at-home-switches
+chaos-at-home-ap
 
-[mz_chaos_at_home]
+[mz-chaos-at-home]
 mz-router ansible_host=chmz-router
 mz-ap ansible_host=chmz-ap
 
 
-[chaos_at_home_switches:vars]
+[chaos-at-home-switches:vars]
 ansible_port=22
 
-[chaos_at_home_switches]
+[chaos-at-home-switches]
 ch-sw0 host_name=sw0 ansible_host=192.168.42.200
 ch-sw1 host_name=sw1 ansible_host=192.168.42.201
 
-[chaos_at_home_ap]
+[chaos-at-home-ap]
 ch-ap0 host_name=ap0
 ch-ap1 host_name=ap1
 
-[chaos_at_home_vpn_extern]
+[chaos-at-home-vpn-extern]
 ch-router
 ch-pan
 
@@ -78,7 +76,6 @@ r3-cccamp19-av host_name=av
 [spreadspace:vars]
 host_domain=spreadspace.org
 env_group=spreadspace
-ansible_host={{ host_name }}.{{ host_domain }}
 ansible_port=222
 
 [spreadspace]
@@ -169,7 +166,7 @@ ele_infobeamer
 r3-cccamp19-sw0
 
 [dellos6:children]
-chaos_at_home_switches
+chaos-at-home-switches
 
 
 [kvmhosts]
@@ -224,7 +221,7 @@ scaleway_kernel
 
 [accesspoints:children]
 ele_ap
-chaos_at_home_ap
+chaos-at-home-ap
 
 [dolmetsch_ctl:children]
 ele_dolmetsch_ctl