rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-10 03:01:02 +00:00
Code Issues Releases Wiki Activity

Support ebs nvme blocks

Browse Source 
(cherry picked from commit 4634759449)
This commit is contained in:
Jason-ZW
2018-09-04 09:25:28 +08:00
committed by niusmallnan
parent 4f34527b59
commit 60df255e5e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
config/cloudinit/datasource/metadata/ec2/metadata.go
View File

@@ -37,6 +37,10 @@ const (
defaultNVMeRootDisk = "/dev/nvme0n1" defaultNVMeRootDisk = "/dev/nvme0n1"
) )
var (
nvmeInstanceTypes = []string{"c5", "c5d", "i3.metal", "m5", "m5d", "r5", "r5d", "t3", "z1d"}
)
type MetadataService struct { type MetadataService struct {
metadata.Service metadata.Service
} }
@@ -144,8 +148,11 @@ func (ms MetadataService) FetchMetadata() (datasource.Metadata, error) {
// http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html // http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html
metadata.RootDisk = defaultXVRootDisk metadata.RootDisk = defaultXVRootDisk
if instanceType, err := ms.FetchAttribute("instance-type"); err == nil { if instanceType, err := ms.FetchAttribute("instance-type"); err == nil {
if strings.HasPrefix(instanceType, "m5") || strings.HasPrefix(instanceType, "c5") { for _, nvmeType := range nvmeInstanceTypes {
metadata.RootDisk = defaultNVMeRootDisk if strings.HasPrefix(instanceType, nvmeType) {
metadata.RootDisk = defaultNVMeRootDisk
break
}
} }
} else if _, ok := err.(pkg.ErrNotFound); !ok { } else if _, ok := err.(pkg.ErrNotFound); !ok {
return metadata, err return metadata, err