projects
/
noc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
not need to set a default for install.kernel_cmdline because is skipped if the varaib...
[noc.git]
/
ansible
/
roles
/
vm
/
install
/
tasks
/
main.yml
diff --git
a/ansible/roles/vm/install/tasks/main.yml
b/ansible/roles/vm/install/tasks/main.yml
index
973f44d
..
5043fcc
100644
(file)
--- a/
ansible/roles/vm/install/tasks/main.yml
+++ b/
ansible/roles/vm/install/tasks/main.yml
@@
-33,19
+33,20
@@
- block:
- name: create a temporary workdir
- block:
- name: create a temporary workdir
- command: mktemp -d
+ tempfile:
+ state: directory
register: tmpdir
- import_role:
name: preseed
vars:
register: tmpdir
- import_role:
name: preseed
vars:
- ssh_keys_root: "{{ hostvars[hostname].ssh_keys_root }}"
+ ssh_users_root: "{{ hostvars[hostname].ssh_users_root }}"
install_interface: enp1s1
install_interface: enp1s1
- preseed_tmpdir: "{{ tmpdir.stdout }}"
+ preseed_tmpdir: "{{ tmpdir.path }}"
- name: Make preseed workdir readable by qemu
acl:
- name: Make preseed workdir readable by qemu
acl:
- path: "{{ tmpdir.stdout }}"
+ path: "{{ tmpdir.path }}"
state: present
entity: libvirt-qemu
etype: user
state: present
entity: libvirt-qemu
etype: user
@@
-58,7
+59,7
@@
xml: "{{ lookup('template', 'libvirt-domain.xml.j2') }}"
vars:
run_installer: yes
xml: "{{ lookup('template', 'libvirt-domain.xml.j2') }}"
vars:
run_installer: yes
- preseed_tmpdir: "{{ tmpdir.stdout }}"
+ preseed_tmpdir: "{{ tmpdir.path }}"
- name: start vm
virt:
- name: start vm
virt:
@@
-90,7
+91,7
@@
always:
- name: cleanup temporary workdir
file:
always:
- name: cleanup temporary workdir
file:
- path: "{{ tmpdir.stdout }}"
+ path: "{{ tmpdir.path }}"
state: absent
- name: define new production vm
state: absent
- name: define new production vm