diff --git a/builder/oracle/classic/builder.go b/builder/oracle/classic/builder.go index 79f5f4d50..51e8656c1 100644 --- a/builder/oracle/classic/builder.go +++ b/builder/oracle/classic/builder.go @@ -81,12 +81,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe sourceImageList: b.config.SourceImageList, bootable: true, }, - &stepCreatePersistentVolume{ - volumeSize: fmt.Sprintf("%d", b.config.PersistentVolumeSize), - volumeName: fmt.Sprintf("builder-boot_%s", runID), - sourceImageList: b.config.SourceImageList, - bootable: true, - }, &stepCreatePersistentVolume{ volumeSize: fmt.Sprintf("%d", b.config.PersistentVolumeSize*2), volumeName: fmt.Sprintf("builder-storage_%s", runID), @@ -114,7 +108,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe name: fmt.Sprintf("builder-instance_%s", runID), masterVolumeName: fmt.Sprintf("master-storage_%s", runID), builderVolumeName: fmt.Sprintf("builder-storage_%s", runID), - builderBootName: fmt.Sprintf("builder-boot_%s", runID), }, &communicator.StepConnect{ Config: &b.config.Comm, diff --git a/builder/oracle/classic/step_create_pv_builder.go b/builder/oracle/classic/step_create_pv_builder.go index 6fdbbb202..c40ef3817 100644 --- a/builder/oracle/classic/step_create_pv_builder.go +++ b/builder/oracle/classic/step_create_pv_builder.go @@ -14,7 +14,6 @@ type stepCreatePVBuilder struct { name string masterVolumeName string builderVolumeName string - builderBootName string } func (s *stepCreatePVBuilder) Run(_ context.Context, state multistep.StateBag) multistep.StepAction { @@ -42,15 +41,11 @@ func (s *stepCreatePVBuilder) Run(_ context.Context, state multistep.StateBag) m }, Storage: []compute.StorageAttachmentInput{ { - Volume: s.builderBootName, + Volume: s.builderVolumeName, Index: 1, }, - { - Volume: s.builderVolumeName, - Index: 2, - }, }, - BootOrder: []int{1}, + ImageList: config.SourceImageList, Attributes: config.attribs, SSHKeys: []string{config.Comm.SSHKeyPairName}, }