Simplify vm/install a tiny bit

[noc.git] / ansible / vm-install.yml

diff --git a/ansible/vm-install.yml b/ansible/vm-install.yml
index 198b26f..9e7f055 100644 (file)
--- a/ansible/vm-install.yml
+++ b/ansible/vm-install.yml
@@ -1,6 +1,6 @@
 ---
 - name: preperations and sanity checks
-  hosts: "{{ vmname }}"
+  hosts: "{{ hostname }}"
   gather_facts: no
   tasks:
   - name: setup variables
@@ -14,13 +14,15 @@
       group: _vmhost_
   # TODO: add some sanity checks
 
+- import_playbook: remove_known_hosts.yml
+
 - name: basic installation
   hosts: _vmhost_
   roles:
-  - role: vm-install
+  - role: vm/install
 
 - name: wait for new vm to start up
-  hosts: "{{ vmname }}"
+  hosts: "{{ hostname }}"
   gather_facts: no
   tasks:
     ## TODO: find a better way to fetch host key of new VMs
@@ -35,10 +37,17 @@
     set_fact:
       ansible_ssh_extra_args: ""
 
-- import_playbook: "host_playbooks/{{ vmname }}.yml"
+- name: Apply VM configuration roles
+  hosts: "{{ hostname }}"
+  roles:
+  - role: vm/grub
+  - role: vm/network
+  - role: vm/guest
+
+- import_playbook: "host_playbooks/{{ hostname }}.yml"
 
 - name: reboot and wait for VM come back
-  hosts: "{{ vmname }}"
+  hosts: "{{ hostname }}"
   gather_facts: no
   roles:
   - role: reboot-and-wait