Skip to content

Commit

Permalink
Fixes per code review
Browse files Browse the repository at this point in the history
  • Loading branch information
double16 committed Aug 9, 2018
1 parent d796edc commit 2868971
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
9 changes: 2 additions & 7 deletions builder/azure/arm/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -254,14 +254,9 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
return nil, errors.New("Build was halted.")
}

osType := "Linux"
if b.config.OSType == constants.Target_Windows {
osType = "Windows"
}

if b.config.isManagedImage() {
managedImageID := fmt.Sprintf("/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Compute/images/%s", b.config.SubscriptionID, b.config.ManagedImageResourceGroupName, b.config.ManagedImageName)
return NewManagedImageArtifact(osType, b.config.ManagedImageResourceGroupName, b.config.ManagedImageName, b.config.manageImageLocation, managedImageID)
return NewManagedImageArtifact(b.config.OSType, b.config.ManagedImageResourceGroupName, b.config.ManagedImageName, b.config.manageImageLocation, managedImageID)
} else if template, ok := b.stateBag.GetOk(constants.ArmCaptureTemplate); ok {
return NewArtifact(
template.(*CaptureTemplate),
Expand All @@ -273,7 +268,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
sasUrl, _ := blob.GetSASURI(options)
return sasUrl
},
osType)
b.config.OSType)
}

return &Artifact{}, nil
Expand Down
4 changes: 2 additions & 2 deletions website/source/docs/post-processors/vagrant.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ Currently, the Vagrant post-processor can create boxes for the following
providers.

- AWS
- Azure
- DigitalOcean
- Google
- Azure
- Hyper-V
- LXC
Expand Down Expand Up @@ -107,9 +107,9 @@ where it will be set to 0.
The available provider names are:

- `aws`
- `azure`
- `digitalocean`
- `google`
- `azure`
- `hyperv`
- `parallels`
- `libvirt`
Expand Down

0 comments on commit 2868971

Please sign in to comment.