Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion bosh-stemcell/lib/bosh/stemcell/infrastructure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,14 @@ def initialize
end

def additional_cloud_properties
{'root_device_name' => '/dev/sda1'}
{
'root_device_name' => '/dev/sda1',
'generation' => 'gen2',
'accelerated_networking' => true,
'hibernation' => true,
'disk_controller_types' => ['scsi', 'nvme'],
'security_type' => 'TrustedLaunchSupported'
}
end
end

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
azure-vm-utils
cloud-init
netplan.io
python-is-python3
Expand Down
9 changes: 8 additions & 1 deletion bosh-stemcell/spec/bosh/stemcell/infrastructure_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,14 @@ module Bosh::Stemcell
it { should eq Infrastructure.for('azure') }

it 'has azure specific additional cloud properties' do
expect(subject.additional_cloud_properties).to eq({'root_device_name' => '/dev/sda1'})
expect(subject.additional_cloud_properties).to eq({
'root_device_name' => '/dev/sda1',
'generation' => 'gen2',
'accelerated_networking' => true,
'hibernation' => true,
'disk_controller_types' => ['scsi', 'nvme'],
'security_type' => 'TrustedLaunchSupported'
})
end
end

Expand Down
5 changes: 5 additions & 0 deletions stemcell_builder/stages/image_install_grub/apply.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ case "${stemcell_infrastructure}" in
aws)
grub_suffix="nvme_core.io_timeout=4294967295"
;;
azure)
# For NVMe storage, Microsoft recommends setting nvme_core.io_timeout to 240 seconds
# to avoid IO timeouts and let Azure handle disk failures or interruptions.
grub_suffix="nvme_core.io_timeout=240"
;;
cloudstack)
grub_suffix="console=hvc0"
;;
Expand Down
2 changes: 1 addition & 1 deletion stemcell_builder/stages/system_azure_init/apply.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
base_dir=$(readlink -nf $(dirname $0)/../..)
source $base_dir/lib/prelude_apply.bash

packages="python3 python3-pyasn1 python3-setuptools python3-distro python-is-python3 cloud-init"
packages="python3 python3-pyasn1 python3-setuptools python3-distro python-is-python3 cloud-init azure-vm-utils"
pkg_mgr install $packages

wala_release=2.9.1.1
Expand Down
Loading