24 files changed, 9 insertions, 9 deletions

diff --git a/host_playbooks/elesearch.yml b/host_playbooks/elesearch.yml
index 7640977e..15fca1a7 100644
--- a/host_playbooks/elesearch.yml
+++ b/host_playbooks/elesearch.yml
@@ -3,7 +3,7 @@
   hosts: elesearch
   roles:
   - role: sshserver
-  - role: vm-grub
-  - role: vm-network
+  - role: vm/grub
+  - role: vm/network
   - role: base
   - role: zsh
diff --git a/host_playbooks/emc-master.yml b/host_playbooks/emc-master.yml
index 9d541517..9709409e 100644
--- a/host_playbooks/emc-master.yml
+++ b/host_playbooks/emc-master.yml
@@ -4,6 +4,6 @@
   roles:
   - role: base
   - role: sshserver
-  - role: vm-grub
-#  - role: vm-network
+  - role: vm/grub
+#  - role: vm/network
   - role: zsh
diff --git a/host_playbooks/emc-stats.yml b/host_playbooks/emc-stats.yml
index 1ab4e47b..d11b5b15 100644
--- a/host_playbooks/emc-stats.yml
+++ b/host_playbooks/emc-stats.yml
@@ -4,7 +4,7 @@
   roles:
   - role: base
   - role: sshserver
-  - role: vm-grub
-#  - role: vm-network
+  - role: vm/grub
+#  - role: vm/network
   - role: zsh
   - role: emc-stats
diff --git a/host_playbooks/sk2013.yml b/host_playbooks/sk2013.yml
index 387f1af1..5caa6603 100644
--- a/host_playbooks/sk2013.yml
+++ b/host_playbooks/sk2013.yml
@@ -3,4 +3,4 @@
   hosts: sk2013
   roles:
   - role: sshserver
-  - role: vm-host
+  - role: vm/host
diff --git a/host_playbooks/sk2016.yml b/host_playbooks/sk2016.yml
index 33de823d..ef3d7c43 100644
--- a/host_playbooks/sk2016.yml
+++ b/host_playbooks/sk2016.yml
@@ -3,4 +3,4 @@
   hosts: sk2016
   roles:
   - role: sshserver
-  - role: vm-host
+  - role: vm/host
diff --git a/roles/vm-grub/handlers/main.yml b/roles/vm/grub/handlers/main.yml
index 4bddbb14..4bddbb14 100644
--- a/roles/vm-grub/handlers/main.yml
+++ b/roles/vm/grub/handlers/main.yml
diff --git a/roles/vm-grub/tasks/main.yml b/roles/vm/grub/tasks/main.yml
index bd48a470..bd48a470 100644
--- a/roles/vm-grub/tasks/main.yml
+++ b/roles/vm/grub/tasks/main.yml
diff --git a/roles/vm-host/defaults/main.yml b/roles/vm/host/defaults/main.yml
index 0e3cddf1..0e3cddf1 100644
--- a/roles/vm-host/defaults/main.yml
+++ b/roles/vm/host/defaults/main.yml
diff --git a/roles/vm-host/handlers/main.yml b/roles/vm/host/handlers/main.yml
index 158f4dcd..158f4dcd 100644
--- a/roles/vm-host/handlers/main.yml
+++ b/roles/vm/host/handlers/main.yml
diff --git a/roles/vm-host/tasks/main.yml b/roles/vm/host/tasks/main.yml
index a5e98fa9..a5e98fa9 100644
--- a/roles/vm-host/tasks/main.yml
+++ b/roles/vm/host/tasks/main.yml
diff --git a/roles/vm-install/library/wait_for_virt.py b/roles/vm/install/library/wait_for_virt.py
index 6c49fae1..6c49fae1 100644
--- a/roles/vm-install/library/wait_for_virt.py
+++ b/roles/vm/install/library/wait_for_virt.py
diff --git a/roles/vm-install/tasks/main.yml b/roles/vm/install/tasks/main.yml
index 22a6a351..22a6a351 100644
--- a/roles/vm-install/tasks/main.yml
+++ b/roles/vm/install/tasks/main.yml
diff --git a/roles/vm-install/templates/libvirt-domain.xml.j2 b/roles/vm/install/templates/libvirt-domain.xml.j2
index c84b1045..c84b1045 100644
--- a/roles/vm-install/templates/libvirt-domain.xml.j2
+++ b/roles/vm/install/templates/libvirt-domain.xml.j2
diff --git a/roles/vm-install/templates/preseed_debian-stretch.cfg.j2 b/roles/vm/install/templates/preseed_debian-stretch.cfg.j2
index 55ddbfc2..55ddbfc2 100644
--- a/roles/vm-install/templates/preseed_debian-stretch.cfg.j2
+++ b/roles/vm/install/templates/preseed_debian-stretch.cfg.j2
diff --git a/roles/vm-network/handlers/main.yml b/roles/vm/network/handlers/main.yml
index f967fa86..f967fa86 100644
--- a/roles/vm-network/handlers/main.yml
+++ b/roles/vm/network/handlers/main.yml
diff --git a/roles/vm-network/tasks/lan.yml b/roles/vm/network/tasks/lan.yml
index ec436e9b..ec436e9b 100644
--- a/roles/vm-network/tasks/lan.yml
+++ b/roles/vm/network/tasks/lan.yml
diff --git a/roles/vm-network/tasks/main.yml b/roles/vm/network/tasks/main.yml
index 222a350b..222a350b 100644
--- a/roles/vm-network/tasks/main.yml
+++ b/roles/vm/network/tasks/main.yml
diff --git a/roles/vm-network/tasks/public.yml b/roles/vm/network/tasks/public.yml
index 8b0e317a..8b0e317a 100644
--- a/roles/vm-network/tasks/public.yml
+++ b/roles/vm/network/tasks/public.yml
diff --git a/roles/vm-network/tasks/systemd-link.yml b/roles/vm/network/tasks/systemd-link.yml
index ad12cd37..ad12cd37 100644
--- a/roles/vm-network/tasks/systemd-link.yml
+++ b/roles/vm/network/tasks/systemd-link.yml
diff --git a/roles/vm-network/templates/firewall.sh_public.j2 b/roles/vm/network/templates/firewall.sh_public.j2
index df5b1373..df5b1373 100644
--- a/roles/vm-network/templates/firewall.sh_public.j2
+++ b/roles/vm/network/templates/firewall.sh_public.j2
diff --git a/roles/vm-network/templates/interfaces_lan.j2 b/roles/vm/network/templates/interfaces_lan.j2
index 36ae2883..36ae2883 100644
--- a/roles/vm-network/templates/interfaces_lan.j2
+++ b/roles/vm/network/templates/interfaces_lan.j2
diff --git a/roles/vm-network/templates/interfaces_public.j2 b/roles/vm/network/templates/interfaces_public.j2
index 2e8583ab..2e8583ab 100644
--- a/roles/vm-network/templates/interfaces_public.j2
+++ b/roles/vm/network/templates/interfaces_public.j2
diff --git a/roles/vm-network/templates/systemd.link.j2 b/roles/vm/network/templates/systemd.link.j2
index 753fd586..753fd586 100644
--- a/roles/vm-network/templates/systemd.link.j2
+++ b/roles/vm/network/templates/systemd.link.j2
diff --git a/vm-install.yml b/vm-install.yml
index e82aa33c..c79adc2f 100644
--- a/vm-install.yml
+++ b/vm-install.yml
@@ -8,7 +8,7 @@
     delegate_to: "{{ vm_install.host }}"
     delegate_facts: yes
   roles:
-  - role: vm-install
+  - role: vm/install
 
 - import_playbook: "host_playbooks/{{ vmname }}.yml"