diff --git a/inventory/group_vars/buildvm_armv7 b/inventory/group_vars/buildvm_armv7 index 28d05fc764..c710a6bb26 100644 --- a/inventory/group_vars/buildvm_armv7 +++ b/inventory/group_vars/buildvm_armv7 @@ -2,12 +2,12 @@ # common items for the buildvm-aarmv7* koji builders volgroup: /dev/vg_guests lvm_size: 140000 -mem_size: 24576 +mem_size: 40960 max_mem_size: "{{ mem_size }}" num_cpus: 5 max_cpu: "{{ num_cpus }}" ks_url: http://10.3.163.35/repo/rhel/ks/buildvm-fedora-34-armv7 -ks_repo: http://10.3.163.35/pub/fedora/linux/releases/34/Server/armhfp/os/ +ks_repo: http://10.3.163.35/pub/fedora/linux/development/34/Server/armhfp/os/ nm: 255.255.255.0 gw: 10.3.170.254 dns: 10.3.163.33 diff --git a/tasks/virt_instance_create.yml b/tasks/virt_instance_create.yml index b005f1f36b..bb359a763b 100644 --- a/tasks/virt_instance_create.yml +++ b/tasks/virt_instance_create.yml @@ -35,60 +35,60 @@ delay: 20 when: inventory_hostname not in result.list_vms -- name: ARMv7 copy the kernel out - shell: "virt-builder --get-kernel {{ volgroup }}/{{ inventory_hostname }} --output /var/lib/libvirt/images/ | awk -F/ '{print $NF}' > /var/lib/libvirt/images/{{ inventory_hostname }}-details.txt" - delegate_to: "{{ vmhost}}" - when: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) - 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: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) - 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: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) - 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}}" - register: host_cmdline - when: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) - tags: - - armv7-kernel - -- name: ARMv7 update the virt parameters - vars: - ansible_python_interpreter: /usr/bin/python3 - 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: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) - tags: - - armv7-kernel - -- name: when armv7kernelupdate is set we are done - fail: msg="armv7kernelupdate was set, so kernel has been updated and target booted up" - when: armv7kernelupdate is defined +#- name: ARMv7 copy the kernel out +# shell: "virt-builder --get-kernel {{ volgroup }}/{{ inventory_hostname }} --output /var/lib/libvirt/images/ | awk -F/ '{print $NF}' > /var/lib/libvirt/images/{{ inventory_hostname }}-details.txt" +# delegate_to: "{{ vmhost}}" +# when: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) +# 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: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) +# 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: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) +# 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}}" +# register: host_cmdline +# when: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) +# tags: +# - armv7-kernel +# +#- name: ARMv7 update the virt parameters +# vars: +# ansible_python_interpreter: /usr/bin/python3 +# 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: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) +# tags: +# - armv7-kernel +# +#- name: when armv7kernelupdate is set we are done +# fail: msg="armv7kernelupdate was set, so kernel has been updated and target booted up" +# when: armv7kernelupdate is defined - name: start the vm up and set it to autostart virt: state=running name={{ inventory_hostname }} autostart=True delegate_to: "{{ vmhost }}" when: inventory_hostname not in result.list_vms -- name: ARMv7 pause while VM updates - pause: seconds=5 - when: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) - tags: - - armv7-kernel +#- name: ARMv7 pause while VM updates +# pause: seconds=5 +# when: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) +# tags: +# - armv7-kernel - name: make sure there is no old ssh host key for the host still around local_action: known_hosts path={{item}} host={{ inventory_hostname }} state=absent