Skip to content

Commit d960ec0

Browse files
committed
Move package installation to stackhpc.libvirt-host role
See: stackhpc/ansible-role-libvirt-host#7
1 parent e96b7aa commit d960ec0

File tree

6 files changed

+0
-71
lines changed

6 files changed

+0
-71
lines changed

README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ Role Variables
2727

2828
- `libvirt_vm_arch`: CPU architecture, default is `x86_64`.
2929

30-
- `libvirt_vm_enable_efi_support`: Whether to enable EFI support. By default this
31-
will enabled if any of the declared VMs specify the boot_firmware as efi. The
32-
certificates and keys needed to enable secure boot are currently only installed
33-
on RedHat derived distributions. See: [qemu-ovmf-secureboot](https://github.com/puiterwijk/qemu-ovmf-secureboot)
34-
for details of the certificates and keys that are installed.
35-
3630
- `libvirt_vms`: list of VMs to be created/destroyed. Each one may have the
3731
following attributes:
3832

defaults/main.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ libvirt_ovmf_vars_generator_output_path: /var/lib/libvirt/qemu/
3434
# Prefix of generated variable file name. The checksum of the input will be appended.
3535
libvirt_ovmf_vars_generator_output_prefix: ovmf_vars_enrolled_
3636

37-
# Whether to enable EFI support.
38-
libvirt_vm_enable_efi_support: "{{ 'efi' in (libvirt_vms | map(attribute='boot_firmware') | map('lower')) }}"
39-
4037
# A list of specifications of VMs to be created.
4138
# For backwards compatibility, libvirt_vms defaults to a singleton list using
4239
# the values of the deprecated variables below.

tasks/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
---
22

3-
- include_tasks: setup.yml
4-
53
- include_tasks: autodetect.yml
64
# We don't need to know the engine and emulator if we're not creating any new
75
# VMs.

tasks/setup.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

vars/Debian.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@ libvirt_vm_qemu_user: libvirt-qemu
77
# The environment passed to virt_volume.sh
88
libvirt_vm_volume_creation_env: {}
99

10-
# Packages that are only necessary if you require EFI support
11-
libvirt_vm_extra_packages_efi:
12-
- ovmf
13-
14-
# List of extra packages to install
15-
libvirt_vm_extra_packages: "{{ libvirt_vm_extra_packages_efi if libvirt_vm_enable_efi_support else [] | unique }}"
16-
1710
# Path to template OVMF efi variable store. A copy will be created
1811
# for each VM created.
1912
libvirt_vm_ovmf_efi_variable_store_path: /usr/share/OVMF/OVMF_VARS.fd

vars/RedHat.yml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@ libvirt_vm_volume_creation_env:
99
VOLUME_GROUP: qemu
1010
VOLUME_OWNER: qemu
1111

12-
# Packages that are only necessary if you require EFI support
13-
libvirt_vm_extra_packages_efi:
14-
- edk2.git-ovmf-x64 # Official OVMF package doesn't boot (CentOS 7.5)
15-
- qemu-kvm-ev # Need smm support for secure boot
16-
17-
# List of extra packages to install
18-
libvirt_vm_extra_packages: "{{ libvirt_vm_extra_packages_efi if libvirt_vm_enable_efi_support else [] | unique }}"
19-
2012
# Path to template OVMF efi variable store. A copy will be created
2113
# for each VM created.
2214
# note(wszumski): official package path is /usr/share/OVMF/OVMF_VARS.fd
@@ -30,17 +22,3 @@ libvirt_vm_ovmf_efi_firmware_path: /usr/share/edk2.git/ovmf-x64/OVMF_CODE-need-s
3022
# note(wszumski): official package path is /usr/share/OVMF/UefiShell.iso
3123
libvirt_vm_ovmf_uefi_shell_iso_path: /usr/share/edk2.git/ovmf-x64/UefiShell.iso
3224

33-
# Add custom repository as OVMF package seems to be broken
34-
libvirt_vm_custom_yum_repos_efi:
35-
- name: qemu-firmware-jenkins
36-
description: upstream OVMF firmware images
37-
baseurl: https://www.kraxel.org/repos/jenkins/
38-
gpgcheck: no
39-
# Need an updated version of qemu with smm support
40-
- name: centos-qemu-ev
41-
description: CentOS-$releasever - QEMU EV
42-
baseurl: http://mirror.centos.org/$contentdir/$releasever/virt/$basearch/kvm-common/
43-
gpgcheck: yes
44-
45-
libvirt_vm_custom_yum_repos: "{{ libvirt_vm_custom_yum_repos_efi if libvirt_vm_enable_efi_support else [] | unique }}"
46-

0 commit comments

Comments
 (0)