Skip to content

Commit

Permalink
Revert "systemvm template: remove hyperv packages and do not export"
Browse files Browse the repository at this point in the history
This reverts commit 4383d59.
  • Loading branch information
weizhouapache committed Feb 5, 2024
1 parent 8b86797 commit 9cd93a5
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
12 changes: 12 additions & 0 deletions tools/appliance/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,17 @@ function vmware_export() {
log INFO "${appliance} exported for VMWare: dist/${appliance_build_name}-vmware.ova"
}

function hyperv_export() {
log INFO "creating hyperv export"
qemu-img convert -f qcow2 -O vpc "dist/${appliance}" "dist/${appliance_build_name}-hyperv.vhd"
CDIR=$PWD
cd dist
zip "${appliance_build_name}-hyperv.vhd.zip" "${appliance_build_name}-hyperv.vhd"
rm -f *vhd
cd $CDIR
log INFO "${appliance} exported for HyperV: dist/${appliance_build_name}-hyperv.vhd.zip"
}

###
### Main invocation
###
Expand All @@ -341,6 +352,7 @@ function main() {
ovm_export
xen_server_export
vmware_export
hyperv_export
rm -f "dist/${appliance}"
cd dist && chmod +r * && cd ..
cd dist && md5sum * > md5sum.txt && cd ..
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ function configure_services() {
# Disable guest services which will selectively be started based on hypervisor
systemctl disable open-vm-tools
systemctl disable xe-daemon
systemctl disable hyperv-daemons.hv-fcopy-daemon.service
systemctl disable hyperv-daemons.hv-kvp-daemon.service
systemctl disable hyperv-daemons.hv-vss-daemon.service
systemctl disable qemu-guest-agent

# Disable container services
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function install_packages() {
radvd \
sharutils genisoimage \
strongswan libcharon-extra-plugins libstrongswan-extra-plugins strongswan-charon strongswan-starter \
virt-what open-vm-tools qemu-guest-agent cloud-guest-utils \
virt-what open-vm-tools qemu-guest-agent hyperv-daemons cloud-guest-utils \
conntrack apt-transport-https ca-certificates curl gnupg gnupg-agent software-properties-common

apt-get install -y python3-json-pointer python3-jsonschema cloud-init
Expand Down

0 comments on commit 9cd93a5

Please sign in to comment.