refactor vm role names

23 files changed, 104 insertions, 103 deletions

diff --git a/roles/vm/grub/handlers/main.yml b/roles/vm/grub/handlers/main.yml
deleted file mode 100644
index 4bddbb14..00000000
--- a/roles/vm/grub/handlers/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: update grub
-  command: /usr/sbin/update-grub
diff --git a/roles/vm/grub/tasks/main.yml b/roles/vm/grub/tasks/main.yml
deleted file mode 100644
index e663e808..00000000
--- a/roles/vm/grub/tasks/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: enable serial console in grub and for kernel
-  vars:
-    grub_options:
-      GRUB_TIMEOUT: 2
-      GRUB_CMDLINE_LINUX: '"console=ttyS0,115200n8"'
-      GRUB_TERMINAL: serial
-      GRUB_SERIAL_COMMAND: >-
-        "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"
-  loop: "{{ grub_options | dict2items }}"
-  loop_control:
-    label: "{{ item.key }}"
-  lineinfile:
-    dest: /etc/default/grub
-    regexp: "^{{ item.key }}="
-    line: "{{ item.key }}={{ item.value }}"
-  notify: update grub
diff --git a/roles/vm/guest/defaults/main.yml b/roles/vm/guest/base/defaults/main.yml
index ce072e95..ce072e95 100644
--- a/roles/vm/guest/defaults/main.yml
+++ b/roles/vm/guest/base/defaults/main.yml
diff --git a/roles/vm/guest/handlers/main.yml b/roles/vm/guest/base/handlers/main.yml
index 5b57f3bc..2dfdddcb 100644
--- a/roles/vm/guest/handlers/main.yml
+++ b/roles/vm/guest/base/handlers/main.yml
@@ -1,3 +1,7 @@
+---
+- name: update grub
+  command: /usr/sbin/update-grub
+
 - name: restart rngd
   service:
     name: rng-tools
diff --git a/roles/vm/guest/tasks/main.yml b/roles/vm/guest/base/tasks/main.yml
index e68f04df..b76ee762 100644
--- a/roles/vm/guest/tasks/main.yml
+++ b/roles/vm/guest/base/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - name: install rngd
   apt:
     name: rng-tools
@@ -40,3 +41,21 @@
         [Service]
         ExecStart=
         ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 --noclear --autologin root --login-pause --host {{ vm_host_cooked.name }} %I $TERM
+
+
+- name: enable serial console in grub and for kernel
+  vars:
+    grub_options:
+      GRUB_TIMEOUT: 2
+      GRUB_CMDLINE_LINUX: '"console=ttyS0,115200n8"'
+      GRUB_TERMINAL: serial
+      GRUB_SERIAL_COMMAND: >-
+        "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"
+  loop: "{{ grub_options | dict2items }}"
+  loop_control:
+    label: "{{ item.key }}"
+  lineinfile:
+    dest: /etc/default/grub
+    regexp: "^{{ item.key }}="
+    line: "{{ item.key }}={{ item.value }}"
+  notify: update grub
diff --git a/roles/vm/define/defaults/main.yml b/roles/vm/guest/define/defaults/main.yml
index f0bcc4fd..f0bcc4fd 100644
--- a/roles/vm/define/defaults/main.yml
+++ b/roles/vm/guest/define/defaults/main.yml
diff --git a/roles/vm/define/tasks/main.yml b/roles/vm/guest/define/tasks/main.yml
index d0790628..d0790628 100644
--- a/roles/vm/define/tasks/main.yml
+++ b/roles/vm/guest/define/tasks/main.yml
diff --git a/roles/vm/define/templates/libvirt-domain.xml.j2 b/roles/vm/guest/define/templates/libvirt-domain.xml.j2
index ba0dcd5a..ba0dcd5a 100644
--- a/roles/vm/define/templates/libvirt-domain.xml.j2
+++ b/roles/vm/guest/define/templates/libvirt-domain.xml.j2
diff --git a/roles/vm/install/library/wait_for_virt.py b/roles/vm/guest/install/library/wait_for_virt.py
index 6c49fae1..6c49fae1 100644
--- a/roles/vm/install/library/wait_for_virt.py
+++ b/roles/vm/guest/install/library/wait_for_virt.py
diff --git a/roles/vm/install/tasks/installer-debian.yml b/roles/vm/guest/install/tasks/installer-debian.yml
index e0492969..e0492969 100644
--- a/roles/vm/install/tasks/installer-debian.yml
+++ b/roles/vm/guest/install/tasks/installer-debian.yml
diff --git a/roles/vm/install/tasks/installer-openbsd.yml b/roles/vm/guest/install/tasks/installer-openbsd.yml
index afa17c45..afa17c45 100644
--- a/roles/vm/install/tasks/installer-openbsd.yml
+++ b/roles/vm/guest/install/tasks/installer-openbsd.yml
diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/guest/install/tasks/main.yml
index a4511459..21a13b4d 100644
--- a/roles/vm/install/tasks/main.yml
+++ b/roles/vm/guest/install/tasks/main.yml
@@ -50,11 +50,12 @@
         etype: user
         permissions: rx
 
-    - vars:
+    - name: define installer vm
+      vars:
         vm_define_installer: yes
         installer_tmpdir: "{{ tmpdir.path }}"
       import_role:
-        name: vm/define
+        name: vm/guest/define
 
     - debug:
         msg: "you can check on the status of the installer running this command 'virsh console {{ install_hostname }}' on host {{ inventory_hostname }}."
@@ -82,7 +83,8 @@
         path: "{{ tmpdir.path }}"
         state: absent
 
-- vars:
+- name: define vm
+  vars:
     vm_define_installer: no
   import_role:
-    name: vm/define
+    name: vm/guest/define
diff --git a/roles/vm/network/handlers/main.yml b/roles/vm/guest/network/handlers/main.yml
index f967fa86..f967fa86 100644
--- a/roles/vm/network/handlers/main.yml
+++ b/roles/vm/guest/network/handlers/main.yml
diff --git a/roles/vm/network/tasks/main.yml b/roles/vm/guest/network/tasks/main.yml
index 27a7682a..27a7682a 100644
--- a/roles/vm/network/tasks/main.yml
+++ b/roles/vm/guest/network/tasks/main.yml
diff --git a/roles/vm/network/templates/interfaces.j2 b/roles/vm/guest/network/templates/interfaces.j2
index 8c288669..8c288669 100644
--- a/roles/vm/network/templates/interfaces.j2
+++ b/roles/vm/guest/network/templates/interfaces.j2
diff --git a/roles/vm/network/templates/resolv.conf.j2 b/roles/vm/guest/network/templates/resolv.conf.j2
index 00aaafe3..00aaafe3 100644
--- a/roles/vm/network/templates/resolv.conf.j2
+++ b/roles/vm/guest/network/templates/resolv.conf.j2
diff --git a/roles/vm/network/templates/systemd.link.j2 b/roles/vm/guest/network/templates/systemd.link.j2
index 7093e164..7093e164 100644
--- a/roles/vm/network/templates/systemd.link.j2
+++ b/roles/vm/guest/network/templates/systemd.link.j2
diff --git a/roles/vm/host/handlers/main.yml b/roles/vm/host/base/handlers/main.yml
index 6541dd80..6541dd80 100644
--- a/roles/vm/host/handlers/main.yml
+++ b/roles/vm/host/base/handlers/main.yml
diff --git a/roles/vm/host/tasks/main.yml b/roles/vm/host/base/tasks/main.yml
index 4c29970d..1a7cb7d8 100644
--- a/roles/vm/host/tasks/main.yml
+++ b/roles/vm/host/base/tasks/main.yml
@@ -18,10 +18,6 @@
     path: /etc/default/haveged
   notify: restart haveged
 
-- name: install vm-host network
-  when: "'network' in vm_host"
-  include_tasks: network.yml
-
 - name: prepare zfs volumes
   when: "'zfs' in vm_host"
   include_tasks: zfs.yml
diff --git a/roles/vm/host/tasks/zfs.yml b/roles/vm/host/base/tasks/zfs.yml
index b84f2d0d..b84f2d0d 100644
--- a/roles/vm/host/tasks/zfs.yml
+++ b/roles/vm/host/base/tasks/zfs.yml
diff --git a/roles/vm/host/network/tasks/network.yml b/roles/vm/host/network/tasks/network.yml
new file mode 100644
index 00000000..103ff194
--- /dev/null
+++ b/roles/vm/host/network/tasks/network.yml
@@ -0,0 +1,22 @@
+---
+- name: create network bridges
+  when: "'bridges' in vm_host.network"
+  block:
+  - name: generate bridge interface config
+    loop: "{{ vm_host.network.bridges | default({}) | dict2items }}"
+    loop_control:
+      label: "{{ item.key }}"
+    template:
+      src: bridge-interfaces.j2
+      dest: "/etc/network/interfaces.d/br-{{ item.key }}"
+    register: vmhost_bridge_config
+
+  ## We don't try to be to clever here: aka don't call ifdown before ifup because
+  ## if there are VMs running they would end up with a broken network
+  - name: bring up bridge interfaces
+    loop: "{{ vmhost_bridge_config.results }}"
+    loop_control:
+      label: "br-{{ item.item.key }}"
+    when: item is changed
+    command: "/sbin/ifup br-{{ item.item.key }}"
+    failed_when: false
diff --git a/roles/vm/host/network/templates/bridge-interfaces.j2 b/roles/vm/host/network/templates/bridge-interfaces.j2
new file mode 100644
index 00000000..05144430
--- /dev/null
+++ b/roles/vm/host/network/templates/bridge-interfaces.j2
@@ -0,0 +1,53 @@
+{% set bridge_name = 'br-'+item.key %}
+{% set bridge = item.value %}
+{% set interface = (network.interfaces | selectattr('name', 'eq', bridge_name) | first | default({})) %}
+auto {{ bridge_name }}
+{% if 'address' in interface %}
+iface {{ bridge_name }} inet static
+  address {{ interface.address | ipaddr('address') }}
+  netmask {{ interface.address | ipaddr('netmask') }}
+{%   if 'gateway' in interface %}
+  gateway {{ interface.gateway }}
+{%   endif %}
+{% else %}
+iface {{ bridge_name }} inet manual
+{% endif %}
+{% if 'interfaces' in bridge and (bridge.interfaces | length) > 0 %}
+  bridge_ports {{ bridge.interfaces | join(' ') }}
+{% else %}
+  bridge_ports none
+{% endif %}
+  bridge_stp off
+  bridge_waitport 0
+  bridge_fd 0
+  up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/accept_ra
+  up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/autoconf
+  up modprobe br_netfilter
+  up /sbin/sysctl net.bridge.bridge-nf-call-iptables=0
+  up /sbin/sysctl net.bridge.bridge-nf-call-ip6tables=0
+  up /sbin/sysctl net.bridge.bridge-nf-call-arptables=0
+{% if 'address' in interface and 'prefix' in bridge %}
+{%   if 'nat' in bridge and bridge.nat %}
+  up echo 1 > /proc/sys/net/ipv4/conf/$IFACE/forwarding
+  up echo 1 > /proc/sys/net/ipv4/conf/{{ ansible_default_ipv4.interface }}/forwarding
+  up /sbin/iptables -t nat -A POSTROUTING -o {{ ansible_default_ipv4.interface }} -s {{ bridge.prefix }} -j SNAT --to {{ ansible_default_ipv4.address }}
+{%   endif %}
+{%   if 'overlay' in bridge %}
+{%     for dest, offset in (bridge.overlay.offsets | dictsort(by='value')) %}
+  up /bin/ip route add {{ (bridge.overlay.prefix | ipaddr(offset)).split('/')[0] }}/32 via {{ (bridge.prefix | ipaddr(bridge.offsets[dest])).split('/')[0] }}  # {{ dest }}
+{%     endfor %}
+  up /bin/ip route add unreachable {{ bridge.overlay.prefix }}
+  down /sbin/ip route del {{ bridge.overlay.prefix }}
+{%   endif %}
+{%   if 'nat' in bridge and bridge.nat %}
+  down /sbin/iptables -t nat -D POSTROUTING -o {{ ansible_default_ipv4.interface }} -s {{ bridge.prefix }} -j SNAT --to {{ ansible_default_ipv4.address }}
+{%   endif %}
+{% endif %}
+{% if 'address6' in interface %}
+
+iface {{ bridge_name }} inet6 static
+  address {{ interface.address6 }}
+{%   if 'gateway6' in interface %}
+  gateway {{ interface.gateway6 }}
+{%   endif %}
+{% endif %}
diff --git a/roles/vm/host/tasks/network.yml b/roles/vm/host/tasks/network.yml
deleted file mode 100644
index 802ffd8b..00000000
--- a/roles/vm/host/tasks/network.yml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-- name: create network bridges
-  when: "'bridges' in vm_host.network"
-  block:
-    - name: generate bridge interface config
-      loop: "{{ vm_host.network.bridges | default({}) | dict2items }}"
-      loop_control:
-        label: "{{ item.key }}"
-      copy:
-        dest: "/etc/network/interfaces.d/br-{{ item.key }}"
-        content: |
-          {% set bridge_name = 'br-'+item.key %}
-          {% set bridge = item.value %}
-          {% set interface = (network.interfaces | selectattr('name', 'eq', bridge_name) | first | default({})) %}
-          auto {{ bridge_name }}
-          {% if 'address' in interface %}
-          iface {{ bridge_name }} inet static
-            address {{ interface.address | ipaddr('address') }}
-            netmask {{ interface.address | ipaddr('netmask') }}
-          {%   if 'gateway' in interface %}
-            gateway {{ interface.gateway }}
-          {%   endif %}
-          {% else %}
-          iface {{ bridge_name }} inet manual
-          {% endif %}
-          {% if 'interfaces' in bridge and (bridge.interfaces | length) > 0 %}
-            bridge_ports {{ bridge.interfaces | join(' ') }}
-          {% else %}
-            bridge_ports none
-          {% endif %}
-            bridge_stp off
-            bridge_waitport 0
-            bridge_fd 0
-            up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/accept_ra
-            up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/autoconf
-            up modprobe br_netfilter
-            up /sbin/sysctl net.bridge.bridge-nf-call-iptables=0
-            up /sbin/sysctl net.bridge.bridge-nf-call-ip6tables=0
-            up /sbin/sysctl net.bridge.bridge-nf-call-arptables=0
-          {% if 'address' in interface and 'prefix' in bridge %}
-          {%   if 'nat' in bridge and bridge.nat %}
-            up echo 1 > /proc/sys/net/ipv4/conf/$IFACE/forwarding
-            up echo 1 > /proc/sys/net/ipv4/conf/{{ ansible_default_ipv4.interface }}/forwarding
-            up /sbin/iptables -t nat -A POSTROUTING -o {{ ansible_default_ipv4.interface }} -s {{ bridge.prefix }} -j SNAT --to {{ ansible_default_ipv4.address }}
-          {%   endif %}
-          {%   if 'overlay' in bridge %}
-          {%     for dest, offset in (bridge.overlay.offsets | dictsort(by='value')) %}
-            up /bin/ip route add {{ (bridge.overlay.prefix | ipaddr(offset)).split('/')[0] }}/32 via {{ (bridge.prefix | ipaddr(bridge.offsets[dest])).split('/')[0] }}  # {{ dest }}
-          {%     endfor %}
-            up /bin/ip route add unreachable {{ bridge.overlay.prefix }}
-            down /sbin/ip route del {{ bridge.overlay.prefix }}
-          {%   endif %}
-          {%   if 'nat' in bridge and bridge.nat %}
-            down /sbin/iptables -t nat -D POSTROUTING -o {{ ansible_default_ipv4.interface }} -s {{ bridge.prefix }} -j SNAT --to {{ ansible_default_ipv4.address }}
-          {%   endif %}
-          {% endif %}
-          {% if 'address6' in interface %}
-
-          iface {{ bridge_name }} inet6 static
-            address {{ interface.address6 }}
-          {%   if 'gateway6' in interface %}
-            gateway {{ interface.gateway6 }}
-          {%   endif %}
-          {% endif %}
-      register: vmhost_bridge_config
-
-    ## We don't try to be to clever here: aka don't call ifdown before ifup because
-    ## if there are VMs running they would end up with a broken network
-    - name: bring up bridge interfaces
-      loop: "{{ vmhost_bridge_config.results }}"
-      loop_control:
-        label: "br-{{ item.item.key }}"
-      when: item is changed
-      command: "/sbin/ifup br-{{ item.item.key }}"
-      failed_when: false