diff --git a/builder/oracle/classic/pv_config.go b/builder/oracle/classic/pv_config.go index 9d40f6b36..623e5e917 100644 --- a/builder/oracle/classic/pv_config.go +++ b/builder/oracle/classic/pv_config.go @@ -19,13 +19,9 @@ type PVConfig struct { BuilderImageList string `mapstructure:"builder_image_list"` BuilderImageListEntry int `mapstructure:"builder_image_list_entry"` /* TODO: - some way to choose which connection to use for master - possible ignore everything for builder and always use SSH keys * Documentation - * Configuration (master/builder images & entry, destination stuff, etc) - * Image entry for both master/builder - https://github.com/hashicorp/packer/issues/6833 * split master/builder image/connection config. i.e. build anything, master only linux + possible ignore everything for builder and always use SSH keys */ } @@ -114,9 +110,6 @@ curl -I -X HEAD \ "${STORAGE_URL}/compute_images/{{.ImageFile}}" ` } - /* - errs = packer.MultiErrorAppend(errs, - fmt.Errorf("Persistent storage volumes are only supported on unix, and must use the ssh communicator.")) - */ + return } diff --git a/builder/oracle/classic/step_create_pv_builder.go b/builder/oracle/classic/step_create_pv_builder.go index a2109586d..23b03c382 100644 --- a/builder/oracle/classic/step_create_pv_builder.go +++ b/builder/oracle/classic/step_create_pv_builder.go @@ -33,7 +33,7 @@ func (s *stepCreatePVBuilder) Run(_ context.Context, state multistep.StateBag) m Name: s.Name, Shape: config.BuilderShape, Networking: map[string]compute.NetworkingInfo{ - "eth0": compute.NetworkingInfo{ + "eth0": { Nat: []string{ipAddName}, SecLists: []string{secListName}, }, diff --git a/builder/oracle/classic/step_create_pv_master.go b/builder/oracle/classic/step_create_pv_master.go index 82063a1b1..a9d21e655 100644 --- a/builder/oracle/classic/step_create_pv_master.go +++ b/builder/oracle/classic/step_create_pv_master.go @@ -32,7 +32,7 @@ func (s *stepCreatePVMaster) Run(_ context.Context, state multistep.StateBag) mu Name: s.Name, Shape: config.Shape, Networking: map[string]compute.NetworkingInfo{ - "eth0": compute.NetworkingInfo{ + "eth0": { Nat: []string{ipAddName}, SecLists: []string{secListName}, },