fix: go modules conflicts

pull/7459/head
Marin Salinas 7 years ago committed by Megan Marsh
parent 5535dfa03d
commit 4b52816935

@ -218,7 +218,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
&awscommon.StepKeyPair{ &awscommon.StepKeyPair{
Debug: b.config.PackerDebug, Debug: b.config.PackerDebug,
Comm: &b.config.RunConfig.Comm, Comm: &b.config.RunConfig.Comm,
DebugKeyPath: fmt.Sprintf("ec2_%s", b.config.PackerBuildName), DebugKeyPath: fmt.Sprintf("ec2_%s.pem", b.config.PackerBuildName),
}, },
&awscommon.StepSecurityGroup{ &awscommon.StepSecurityGroup{
SecurityGroupFilter: b.config.SecurityGroupFilter, SecurityGroupFilter: b.config.SecurityGroupFilter,

@ -80,7 +80,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
return nil, nil return nil, nil
} }
func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) { func (b *Builder) Run(ui packer.Ui, hook packer.Hook) (packer.Artifact, error) {
clientConfig, err := b.config.Config() clientConfig, err := b.config.Config()
if err != nil { if err != nil {
return nil, err return nil, err

@ -106,7 +106,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
} }
func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) { func (b *Builder) Run(ui packer.Ui, hook packer.Hook) (packer.Artifact, error) {
clientConfig, err := b.config.Config() clientConfig, err := b.config.Config()
if err != nil { if err != nil {
return nil, err return nil, err

@ -82,7 +82,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
return nil, nil return nil, nil
} }
func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) { func (b *Builder) Run(ui packer.Ui, hook packer.Hook) (packer.Artifact, error) {
clientConfig, err := b.config.Config() clientConfig, err := b.config.Config()
if err != nil { if err != nil {
return nil, err return nil, err

@ -183,7 +183,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
return warns, nil return warns, nil
} }
func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) { func (b *Builder) Run(ui packer.Ui, hook packer.Hook) (packer.Artifact, error) {
if runtime.GOOS != "linux" { if runtime.GOOS != "linux" {
return nil, errors.New("The outscale-chroot builder only works on Linux environments.") return nil, errors.New("The outscale-chroot builder only works on Linux environments.")
} }

@ -36,6 +36,12 @@ func (s *StepCreateVolume) Run(ctx context.Context, state multistep.StateBag) mu
volTags, err := s.RootVolumeTags.OAPITags(s.Ctx, oapiconn.GetConfig().Region, state) volTags, err := s.RootVolumeTags.OAPITags(s.Ctx, oapiconn.GetConfig().Region, state)
if err != nil {
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}
var createVolume *oapi.CreateVolumeRequest var createVolume *oapi.CreateVolumeRequest
if config.FromScratch { if config.FromScratch {
rootVolumeType := osccommon.VolumeTypeGp2 rootVolumeType := osccommon.VolumeTypeGp2

Loading…
Cancel
Save