From 8598e2d0a3969ce9d4136c29c56a43b9fbc3c239 Mon Sep 17 00:00:00 2001 From: Matthew Hooker Date: Tue, 16 Oct 2018 14:18:40 -0700 Subject: [PATCH] WIP --- builder/oracle/classic/step_attach_volume.go | 2 +- builder/oracle/classic/step_create_pv_builder.go | 2 +- .../hashicorp/go-oracle-terraform/compute/instances.go | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/builder/oracle/classic/step_attach_volume.go b/builder/oracle/classic/step_attach_volume.go index e5bc78222..c4d06f0ef 100644 --- a/builder/oracle/classic/step_attach_volume.go +++ b/builder/oracle/classic/step_attach_volume.go @@ -37,7 +37,7 @@ func (s *stepAttachVolume) Run(_ context.Context, state multistep.StateBag) mult state.Put(s.instanceInfoKey+"/attachment", sa) - ui.Message("Volume to master attached to builder instance") + ui.Message("Volume attached to instance.") return multistep.ActionContinue } diff --git a/builder/oracle/classic/step_create_pv_builder.go b/builder/oracle/classic/step_create_pv_builder.go index 76cf78637..58dea543d 100644 --- a/builder/oracle/classic/step_create_pv_builder.go +++ b/builder/oracle/classic/step_create_pv_builder.go @@ -47,7 +47,7 @@ func (s *stepCreatePVBuilder) Run(_ context.Context, state multistep.StateBag) m ImageList: config.SourceImageList, Attributes: config.attribs, SSHKeys: []string{config.Comm.SSHKeyPairName}, - //Entry: 5, + Entry: 5, } instanceInfo, err := instanceClient.CreateInstance(input) diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/compute/instances.go b/vendor/github.com/hashicorp/go-oracle-terraform/compute/instances.go index ddfa8d6ec..b7a4e6212 100644 --- a/vendor/github.com/hashicorp/go-oracle-terraform/compute/instances.go +++ b/vendor/github.com/hashicorp/go-oracle-terraform/compute/instances.go @@ -169,6 +169,8 @@ func (i *InstanceInfo) getInstanceName() string { } type CreateInstanceInput struct { + // Optional ImageListEntry number. Default will be used if not specified + Entry int `json:"entry,omitempty"` // A dictionary of user-defined attributes to be made available to the instance. // Optional Attributes map[string]interface{} `json:"attributes"`