Skip to content

Commit ff29741

Browse files
Enable UEFI on KVM hosts (by default), and configure with some default settings
1 parent 5a8a1e2 commit ff29741

File tree

7 files changed

+42
-1
lines changed

7 files changed

+42
-1
lines changed

agent/conf/uefi.properties.in

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# Configuration file for UEFI
19+
20+
guest.nvram.template.legacy=@GUESTNVRAMTEMPLATELEGACY@
21+
guest.loader.legacy=@GUESTLOADERLEGACY@
22+
guest.nvram.template.secure=@GUESTNVRAMTEMPLATESECURE@
23+
guest.loader.secure=@GUESTLOADERSECURE@
24+
guest.nvram.path=@GUESTNVRAMPATH@

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Description: CloudStack server library
2424

2525
Package: cloudstack-agent
2626
Architecture: all
27-
Depends: ${python:Depends}, ${python3:Depends}, openjdk-17-jre-headless | java17-runtime-headless | java17-runtime | zulu-17, cloudstack-common (= ${source:Version}), lsb-base (>= 9), openssh-client, qemu-kvm (>= 2.5) | qemu-system-x86 (>= 5.2), libvirt-bin (>= 1.3) | libvirt-daemon-system (>= 3.0), iproute2, ebtables, vlan, ipset, python3-libvirt, ethtool, iptables, cryptsetup, rng-tools, rsync, lsb-release, ufw, apparmor, cpu-checker, libvirt-daemon-driver-storage-rbd, sysstat
27+
Depends: ${python:Depends}, ${python3:Depends}, openjdk-17-jre-headless | java17-runtime-headless | java17-runtime | zulu-17, cloudstack-common (= ${source:Version}), lsb-base (>= 9), openssh-client, qemu-kvm (>= 2.5) | qemu-system-x86 (>= 5.2), libvirt-bin (>= 1.3) | libvirt-daemon-system (>= 3.0), iproute2, ebtables, vlan, ipset, python3-libvirt, ethtool, iptables, cryptsetup, rng-tools, rsync, ovmf, swtpm, lsb-release, ufw, apparmor, cpu-checker, libvirt-daemon-driver-storage-rbd, sysstat
2828
Recommends: init-system-helpers
2929
Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
3030
Description: CloudStack agent

packaging/debian/replace.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,8 @@ USAGELOG=/var/log/cloudstack/usage/usage.log
5959
USAGESYSCONFDIR=/etc/cloudstack/usage
6060
PACKAGE=cloudstack
6161
EXTENSIONSDEPLOYMENTMODE=production
62+
GUESTNVRAMTEMPLATELEGACY=/usr/share/OVMF/OVMF_VARS_4M.fd
63+
GUESTLOADERLEGACY=/usr/share/OVMF/OVMF_CODE_4M.fd
64+
GUESTNVRAMTEMPLATESECURE=/usr/share/OVMF/OVMF_VARS_4M.ms.fd
65+
GUESTLOADERSECURE=/usr/share/OVMF/OVMF_CODE_4M.secboot.fd
66+
GUESTNVRAMPATH=/var/lib/libvirt/qemu/nvram/

packaging/el8/cloud.spec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ Requires: ipset
115115
Requires: perl
116116
Requires: rsync
117117
Requires: cifs-utils
118+
Requires: edk2-ovmf
119+
Requires: swtpm
118120
Requires: (python3-libvirt or python3-libvirt-python)
119121
Requires: (qemu-img or qemu-tools)
120122
Requires: qemu-kvm

packaging/el8/replace.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,8 @@ USAGECLASSPATH=
5858
USAGELOG=/var/log/cloudstack/usage/usage.log
5959
USAGESYSCONFDIR=/etc/sysconfig
6060
EXTENSIONSDEPLOYMENTMODE=production
61+
GUESTNVRAMTEMPLATELEGACY=/usr/share/edk2/ovmf/OVMF_VARS.fd
62+
GUESTLOADERLEGACY=/usr/share/edk2/ovmf/OVMF_CODE.cc.fd
63+
GUESTNVRAMTEMPLATESECURE=/usr/share/edk2/ovmf/OVMF_VARS.secboot.fd
64+
GUESTLOADERSECURE=/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd
65+
GUESTNVRAMPATH=/var/lib/libvirt/qemu/nvram/

pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,15 +1040,19 @@
10401040
<exclude>dist/console-proxy/js/jquery.js</exclude>
10411041
<exclude>engine/schema/dist/**</exclude>
10421042
<exclude>plugins/hypervisors/hyperv/conf/agent.properties</exclude>
1043+
<exclude>plugins/hypervisors/hyperv/conf/uefi.properties</exclude>
10431044
<exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**</exclude>
10441045
<exclude>scripts/installer/windows/acs_license.rtf</exclude>
10451046
<exclude>scripts/vm/systemvm/id_rsa.cloud</exclude>
10461047
<exclude>services/console-proxy/server/conf/agent.properties</exclude>
1048+
<exclude>services/console-proxy/server/conf/uefi.properties</exclude>
10471049
<exclude>services/console-proxy/server/conf/environment.properties</exclude>
10481050
<exclude>services/console-proxy/server/js/jquery.js</exclude>
10491051
<exclude>services/secondary-storage/conf/agent.properties</exclude>
1052+
<exclude>services/secondary-storage/conf/uefi.properties</exclude>
10501053
<exclude>services/secondary-storage/conf/environment.properties</exclude>
10511054
<exclude>systemvm/agent/conf/agent.properties</exclude>
1055+
<exclude>systemvm/agent/conf/uefi.properties</exclude>
10521056
<exclude>systemvm/agent/conf/environment.properties</exclude>
10531057
<exclude>systemvm/agent/js/jquery.js</exclude>
10541058
<exclude>systemvm/agent/js/jquery.flot.navigate.js</exclude>

systemvm/systemvm-agent-descriptor.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<include>log4j-cloud.xml</include>
6161
<include>consoleproxy.properties</include>
6262
<include>agent.properties</include>
63+
<include>uefi.properties</include>
6364
</includes>
6465
</fileSet>
6566
<fileSet>

0 commit comments

Comments
 (0)