iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use DiskStorageAccountTypes

This commit is contained in:
Paul Meyer 2019-06-02 19:29:45 +00:00
parent 7297d74c98
commit b9b5bb2951
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/azure/chroot/builder.go
View File

@ -175,13 +175,13 @@ func checkDiskCacheType(s string) interface{} {
} }
func checkStorageAccountType(s string) interface{} { func checkStorageAccountType(s string) interface{} {
for _, v := range compute.PossibleStorageAccountTypesValues() { for _, v := range compute.PossibleDiskStorageAccountTypesValues() {
if compute.StorageAccountTypes(s) == v { if compute.DiskStorageAccountTypes(s) == v {
return nil return nil
} }
} }
return fmt.Errorf("%q is not a valid value (%v)", return fmt.Errorf("%q is not a valid value (%v)",
s, compute.PossibleStorageAccountTypesValues()) s, compute.PossibleDiskStorageAccountTypesValues())
} }
func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (packer.Artifact, error) { func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (packer.Artifact, error) {

2
builder/azure/chroot/step_create_new_disk.go
View File

@ -33,7 +33,7 @@ func (s StepCreateNewDisk) Run(ctx context.Context, state multistep.StateBag) mu
disk := compute.Disk{ disk := compute.Disk{
Sku: &compute.DiskSku{ Sku: &compute.DiskSku{
Name: "", Name: compute.DiskStorageAccountTypes(s.DiskStorageAccountType),
}, },
//Zones: nil, //Zones: nil,
DiskProperties: &compute.DiskProperties{ DiskProperties: &compute.DiskProperties{