revert to sane group-names... step 2 of n

18 files changed, 46 insertions, 46 deletions

diff --git a/dan/ele-ap.yml b/dan/ele-ap.yml
index 4eebf849..a64ed8a4 100644
--- a/dan/ele-ap.yml
+++ b/dan/ele-ap.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: ele_ap
+- hosts: ele-ap
   connection: local
   roles:
     - role: openwrt/image
diff --git a/dan/ele-dolmetsch-ctl.yml b/dan/ele-dolmetsch-ctl.yml
index 48e0a101..d16cfbdb 100644
--- a/dan/ele-dolmetsch-ctl.yml
+++ b/dan/ele-dolmetsch-ctl.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: ele_dolmetsch_ctl
+- hosts: ele-dolmetsch-ctl
   connection: local
   roles:
     - role: openwrt/image
diff --git a/dan/ele-dolmetsch-raspi.yml b/dan/ele-dolmetsch-raspi.yml
index 386dbebc..5b1068e0 100644
--- a/dan/ele-dolmetsch-raspi.yml
+++ b/dan/ele-dolmetsch-raspi.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: ele_dolmetsch_raspi
+- hosts: ele-dolmetsch-raspi
   roles:
     - role: slim/raspbian
     - role: base
diff --git a/dan/group_vars/elevate_festival.yml b/dan/group_vars/elevate-festival.yml
index 15ceffe4..15ceffe4 100644
--- a/dan/group_vars/elevate_festival.yml
+++ b/dan/group_vars/elevate-festival.yml
diff --git a/inventory/group_vars/dolmetsch_ctl/main.yml b/inventory/group_vars/dolmetsch-ctl/main.yml
index d1ffc8ae..d1ffc8ae 100644
--- a/inventory/group_vars/dolmetsch_ctl/main.yml
+++ b/inventory/group_vars/dolmetsch-ctl/main.yml
diff --git a/inventory/group_vars/ele_ap/main.yml b/inventory/group_vars/ele-ap/main.yml
index e74539e3..e74539e3 100644
--- a/inventory/group_vars/ele_ap/main.yml
+++ b/inventory/group_vars/ele-ap/main.yml
diff --git a/inventory/group_vars/ele_dolmetsch_ctl/main.yml b/inventory/group_vars/ele-dolmetsch-ctl/main.yml
index a69d45ee..a69d45ee 100644
--- a/inventory/group_vars/ele_dolmetsch_ctl/main.yml
+++ b/inventory/group_vars/ele-dolmetsch-ctl/main.yml
diff --git a/inventory/group_vars/ele_infobeamer/main.yml b/inventory/group_vars/ele-infobeamer/main.yml
index 4e513286..4e513286 100644
--- a/inventory/group_vars/ele_infobeamer/main.yml
+++ b/inventory/group_vars/ele-infobeamer/main.yml
diff --git a/inventory/group_vars/elevate_festival/main.yml b/inventory/group_vars/elevate-festival/main.yml
index 5a513cfe..5a513cfe 100644
--- a/inventory/group_vars/elevate_festival/main.yml
+++ b/inventory/group_vars/elevate-festival/main.yml
diff --git a/inventory/group_vars/emc_xx/main.yml b/inventory/group_vars/emc-xx/main.yml
index e4fc5e0d..e4fc5e0d 100644
--- a/inventory/group_vars/emc_xx/main.yml
+++ b/inventory/group_vars/emc-xx/main.yml
diff --git a/inventory/group_vars/k8s_emc/main.yml b/inventory/group_vars/k8s-emc/main.yml
index 18c28177..18c28177 100644
--- a/inventory/group_vars/k8s_emc/main.yml
+++ b/inventory/group_vars/k8s-emc/main.yml
diff --git a/inventory/group_vars/k8s_test/main.yml b/inventory/group_vars/k8s-test/main.yml
index 7e5cbe2e..7e5cbe2e 100644
--- a/inventory/group_vars/k8s_test/main.yml
+++ b/inventory/group_vars/k8s-test/main.yml
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index bf2c0fb3..8681ba99 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -96,13 +96,13 @@ emc-stats
 emc-master
 
 [emc:children]
-emc_dist
-emc_xx
+emc-dist
+emc-xx
 
-[emc_dist]
+[emc-dist]
 #emc-dist0
 
-[emc_xx]
+[emc-xx]
 #emc-0[0:6]
 emc-00
 
@@ -121,21 +121,21 @@ sk2016 host_name=2016 ansible_port=22000
 sk-cloudia host_name=cloudia
 
 
-[ele_ap]
+[ele-ap]
 ele-ap-forum[0:3]
 #ele-ap-dom0
 ele-ap-kunsthaus0
 ele-ap-orpheum0
 
-[ele_dolmetsch_ctl]
+[ele-dolmetsch-ctl]
 ele-dol-mixer
 ele-dol-translator
 
-[ele_dolmetsch_raspi]
+[ele-dolmetsch-raspi]
 ele-dol-raspi0
 ele-dol-raspi1
 
-[ele_infobeamer]
+[ele-infobeamer]
 ele-infobeamer-emc
 ele-infobeamer-orpheum
 ele-infobeamer-default
@@ -153,10 +153,10 @@ ele-uhrturm host_name=uhrturm
 ele-lt host_name=liquidtruth ansible_port=222
 
 [elevate:children]
-ele_ap
-ele_dolmetsch_ctl
-ele_dolmetsch_raspi
-ele_infobeamer
+ele-ap
+ele-dolmetsch-ctl
+ele-dolmetsch-raspi
+ele-infobeamer
 
 
 ###############################
@@ -205,57 +205,57 @@ emc-stats
 emc-master
 
 [hetzner:children]
-emc_xx
+emc-xx
 hroot
 hcloud
 
 
-[scaleway_kernel]
+[scaleway-kernel]
 
 [scaleway]
 
 [scaleway:children]
-scaleway_kernel
+scaleway-kernel
 
 
 
 [accesspoints:children]
-ele_ap
+ele-ap
 chaos-at-home-ap
 
-[dolmetsch_ctl:children]
-ele_dolmetsch_ctl
+[dolmetsch-ctl:children]
+ele-dolmetsch-ctl
 
-[dolmetsch_raspi:children]
-ele_dolmetsch_raspi
+[dolmetsch-raspi:children]
+ele-dolmetsch-raspi
 
 
 ### kubernetes cluster: emc
-[k8s_emc_encoder]
+[k8s-emc-encoder]
 #dione
 #helene
 
-[k8s_emc_distribution:children]
-emc_dist
+[k8s-emc-distribution:children]
+emc-dist
 
-[k8s_emc_streamer:children]
-emc_xx
+[k8s-emc-streamer:children]
+emc-xx
 
-[k8s_emc_master]
+[k8s-emc-master]
 emc-master
 
-[k8s_emc_stats]
+[k8s-emc-stats]
 emc-stats
 
-[k8s_emc:children]
-k8s_emc_master
-k8s_emc_encoder
-k8s_emc_distribution
-k8s_emc_streamer
-k8s_emc_stats
+[k8s-emc:children]
+k8s-emc-master
+k8s-emc-encoder
+k8s-emc-distribution
+k8s-emc-streamer
+k8s-emc-stats
 
 
 ### Elevate Festival
-[elevate_festival:children]
+[elevate-festival:children]
 elevate
-k8s_emc
+k8s-emc
diff --git a/roles/prepare-dkms/tasks/main.yml b/roles/prepare-dkms/tasks/main.yml
index 7f55ba6d..94f47c31 100644
--- a/roles/prepare-dkms/tasks/main.yml
+++ b/roles/prepare-dkms/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: prepare dkms on scaleway boxes
   include_tasks: scaleway.yml
-  when: "'scaleway_kernel' in group_names"
+  when: "'scaleway-kernel' in group_names"
 
 - name: prepare dkms on for raspberry-pi
   include_tasks: raspberrypi.yml
@@ -9,4 +9,4 @@
 
 - name: prepare dkms on normal debian boxes
   include_tasks: default.yml
-  when: "'scaleway_kernel' not in group_names and ansible_lsb.id != 'Raspbian'"
+  when: "'scaleway-kernel' not in group_names and ansible_lsb.id != 'Raspbian'"
diff --git a/spreadspace/acme-emc.yml b/spreadspace/acme-emc.yml
index d0210e1d..41fff42b 100644
--- a/spreadspace/acme-emc.yml
+++ b/spreadspace/acme-emc.yml
@@ -1,6 +1,6 @@
 ---
 - name: create certificates for host
-  hosts: emc_xx:helene
+  hosts: emc-xx:helene
   vars:
     acmetool_directory_server: "{{ acmetool_directory_server_le_live }}"
   roles:
diff --git a/spreadspace/emc-dist.yml b/spreadspace/emc-dist.yml
index fce5f7e2..d9796969 100644
--- a/spreadspace/emc-dist.yml
+++ b/spreadspace/emc-dist.yml
@@ -1,6 +1,6 @@
 ---
 - name: Basic Setup
-  hosts: emc_dist
+  hosts: emc-dist
   roles:
   - role: slim/hetzner
   - role: base
diff --git a/spreadspace/emc-xx.yml b/spreadspace/emc-xx.yml
index 4627107e..c73ffd0c 100644
--- a/spreadspace/emc-xx.yml
+++ b/spreadspace/emc-xx.yml
@@ -1,6 +1,6 @@
 ---
 - name: Basic Setup
-  hosts: emc_xx:!emc-00
+  hosts: emc-xx:!emc-00
   roles:
   - role: slim/hetzner
   - role: base
diff --git a/spreadspace/k8s-emc.yml b/spreadspace/k8s-emc.yml
index a1b25631..600ab2a1 100644
--- a/spreadspace/k8s-emc.yml
+++ b/spreadspace/k8s-emc.yml
@@ -1,11 +1,11 @@
 ---
 - name: setup cluster config
-  hosts: k8s_emc
+  hosts: k8s-emc
   gather_facts: no
   run_once: yes
   tasks:
   - name: create group for all kubernetes nodes
-    loop: "{{ groups['k8s_emc'] }}"
+    loop: "{{ groups['k8s-emc'] }}"
     add_host:
       name: "{{ item }}"
       inventory_dir: "{{ inventory_dir }}"
@@ -13,7 +13,7 @@
     changed_when: False
 
   - name: create group for kubernetes master nodes
-    loop: "{{ groups['k8s_emc_master'] }}"
+    loop: "{{ groups['k8s-emc-master'] }}"
     add_host:
       name: "{{ item }}"
       inventory_dir: "{{ inventory_dir }}"