summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@fedoraproject.org>2017-04-17 20:22:44 +0000
committerPeter Robinson <pbrobinson@fedoraproject.org>2017-04-17 20:22:44 +0000
commitbb05921e7a869519828008480831dc41b9ff20b2 (patch)
treea05d9c2d7c8ae1fa982e576d8f164d0a272fe08d
parent8d85088269892a16eac153fc0bebd9494bcf2cb1 (diff)
downloadansible-bb05921e7a869519828008480831dc41b9ff20b2.tar.gz
ansible-bb05921e7a869519828008480831dc41b9ff20b2.tar.xz
ansible-bb05921e7a869519828008480831dc41b9ff20b2.zip
builders: ARMv7, make the kernel/initrd args more generic
-rw-r--r--tasks/virt_instance_create.yml18
1 files changed, 17 insertions, 1 deletions
diff --git a/tasks/virt_instance_create.yml b/tasks/virt_instance_create.yml
index c72bc45ce..11049df28 100644
--- a/tasks/virt_instance_create.yml
+++ b/tasks/virt_instance_create.yml
@@ -34,6 +34,22 @@
tags:
- armv7-kernel
+- name: ARMv7 extract the kernel details
+ command: "head -n1 /var/lib/libvirt/images/{{ inventory_hostname }}-details.txt"
+ delegate_to: "{{ vmhost}}"
+ register: host_armv7kernel
+ when: inventory_hostname.startswith('buildvm-armv7') and inventory_hostname not in result.list_vms
+ tags:
+ - armv7-kernel
+
+- name: ARMv7 extract the initrd details
+ command: "tail -n1 /var/lib/libvirt/images/{{ inventory_hostname }}-details.txt"
+ delegate_to: "{{ vmhost}}"
+ register: host_armv7initrd
+ when: inventory_hostname.startswith('buildvm-armv7') and inventory_hostname not in result.list_vms
+ tags:
+ - armv7-kernel
+
- name: ARMv7 copy the cmdline out
shell: "virt-cat -a {{ volgroup }}/{{ inventory_hostname }} /boot/extlinux/extlinux.conf | grep -m1 append | sed -e 's/append //'"
delegate_to: "{{ vmhost}}"
@@ -43,7 +59,7 @@
- armv7-kernel
- name: ARMv7 update the virt parameters
- virt_boot: domain={{ inventory_hostname }} kernel="/var/lib/libvirt/images/vmlinuz-4.10.10-200.fc25.armv7hl+lpae" initrd="/var/lib/libvirt/images/initramfs-4.10.10-200.fc25.armv7hl+lpae.img" cmdline={{ host_cmdline.stdout }}
+ virt_boot: domain={{ inventory_hostname }} kernel=/var/lib/libvirt/images/{{ host_armv7kernel.stdout }} initrd=/var/lib/libvirt/images/{{ host_armv7initrd.stdout }} cmdline={{ host_cmdline.stdout }}
delegate_to: "{{ vmhost }}"
when: inventory_hostname.startswith('buildvm-armv7') and inventory_hostname not in result.list_vms
tags: