Revert "add boot volume to builder instance"

This reverts commit cbce7b42079d2087bc622fd8c6f65d1339b735d1.

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,

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 {
@@ -41,16 +40,12 @@ func (s *stepCreatePVBuilder) Run(_ context.Context, state multistep.StateBag) m
 			},
 		},
 		Storage: []compute.StorageAttachmentInput{
-			{
-				Volume: s.builderBootName,
-				Index:  1,
-			},
 			{
 				Volume: s.builderVolumeName,
-				Index:  2,
+				Index:  1,
 			},
 		},
-		BootOrder:  []int{1},
+		ImageList:  config.SourceImageList,
 		Attributes: config.attribs,
 		SSHKeys:    []string{config.Comm.SSHKeyPairName},
 	}