iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cloudstack: some updates after review

This commit is contained in:
Rickard von Essen 2017-07-14 11:09:21 +02:00
parent 44089b2f55
commit 62dac4a168
No known key found for this signature in database
GPG Key ID: E0C0327388876CBA
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builder/cloudstack/step_create_instance.go
View File

@ -62,7 +62,7 @@ func (s *stepCreateInstance) Run(state multistep.StateBag) multistep.StepAction
// Retrieve the zone object. // Retrieve the zone object.
zone, _, err := client.Zone.GetZoneByID(config.Zone) zone, _, err := client.Zone.GetZoneByID(config.Zone)
if err != nil { if err != nil {
err := fmt.Errorf("Failed to get Zone by ID: %s - %s", config.Zone, err) err := fmt.Errorf("Failed to get zone %s by ID: %s", config.Zone, err)
state.Put("error", err) state.Put("error", err)
ui.Error(err.Error()) ui.Error(err.Error())
return multistep.ActionHalt return multistep.ActionHalt
@ -96,7 +96,6 @@ func (s *stepCreateInstance) Run(state multistep.StateBag) multistep.StepAction
ud, err := s.generateUserData(config.UserData, config.HTTPGetOnly) ud, err := s.generateUserData(config.UserData, config.HTTPGetOnly)
if err != nil { if err != nil {
err := fmt.Errorf("Failed to interpolate user_data: %s", err)
state.Put("error", err) state.Put("error", err)
ui.Error(err.Error()) ui.Error(err.Error())
return multistep.ActionHalt return multistep.ActionHalt

11
builder/cloudstack/step_prepare_config.go
View File

@ -26,7 +26,6 @@ func (s *stepPrepareConfig) Run(state multistep.StateBag) multistep.StepAction {
if config.Project != "" && !isUUID(config.Project) { if config.Project != "" && !isUUID(config.Project) {
config.Project, _, err = client.Project.GetProjectID(config.Project) config.Project, _, err = client.Project.GetProjectID(config.Project)
if err != nil { if err != nil {
ui.Error(err.Error())
errs = packer.MultiErrorAppend(errs, &retrieveErr{"project", config.Project, err}) errs = packer.MultiErrorAppend(errs, &retrieveErr{"project", config.Project, err})
} }
} }
@ -34,7 +33,6 @@ func (s *stepPrepareConfig) Run(state multistep.StateBag) multistep.StepAction {
if config.UserDataFile != "" { if config.UserDataFile != "" {
userdata, err := ioutil.ReadFile(config.UserDataFile) userdata, err := ioutil.ReadFile(config.UserDataFile)
if err != nil { if err != nil {
ui.Error(err.Error())
errs = packer.MultiErrorAppend(errs, fmt.Errorf("problem reading user data file: %s", err)) errs = packer.MultiErrorAppend(errs, fmt.Errorf("problem reading user data file: %s", err))
} }
config.UserData = string(userdata) config.UserData = string(userdata)
@ -43,7 +41,6 @@ func (s *stepPrepareConfig) Run(state multistep.StateBag) multistep.StepAction {
if !isUUID(config.Zone) { if !isUUID(config.Zone) {
config.Zone, _, err = client.Zone.GetZoneID(config.Zone) config.Zone, _, err = client.Zone.GetZoneID(config.Zone)
if err != nil { if err != nil {
ui.Error(err.Error())
errs = packer.MultiErrorAppend(errs, &retrieveErr{"zone", config.Zone, err}) errs = packer.MultiErrorAppend(errs, &retrieveErr{"zone", config.Zone, err})
} }
} }
@ -52,7 +49,6 @@ func (s *stepPrepareConfig) Run(state multistep.StateBag) multistep.StepAction {
if config.DiskOffering != "" && !isUUID(config.DiskOffering) { if config.DiskOffering != "" && !isUUID(config.DiskOffering) {
config.DiskOffering, _, err = client.DiskOffering.GetDiskOfferingID(config.DiskOffering) config.DiskOffering, _, err = client.DiskOffering.GetDiskOfferingID(config.DiskOffering)
if err != nil { if err != nil {
ui.Error(err.Error())
errs = packer.MultiErrorAppend(errs, &retrieveErr{"disk offering", config.DiskOffering, err}) errs = packer.MultiErrorAppend(errs, &retrieveErr{"disk offering", config.DiskOffering, err})
} }
} }
@ -70,7 +66,6 @@ func (s *stepPrepareConfig) Run(state multistep.StateBag) multistep.StepAction {
ipAddrs, err := client.Address.ListPublicIpAddresses(p) ipAddrs, err := client.Address.ListPublicIpAddresses(p)
if err != nil { if err != nil {
ui.Error(err.Error())
errs = packer.MultiErrorAppend(errs, &retrieveErr{"IP address", config.PublicIPAddress, err}) errs = packer.MultiErrorAppend(errs, &retrieveErr{"IP address", config.PublicIPAddress, err})
} }
if err == nil && ipAddrs.Count != 1 { if err == nil && ipAddrs.Count != 1 {
@ -84,7 +79,6 @@ func (s *stepPrepareConfig) Run(state multistep.StateBag) multistep.StepAction {
if !isUUID(config.Network) { if !isUUID(config.Network) {
config.Network, _, err = client.Network.GetNetworkID(config.Network, cloudstack.WithProject(config.Project)) config.Network, _, err = client.Network.GetNetworkID(config.Network, cloudstack.WithProject(config.Project))
if err != nil { if err != nil {
ui.Error(err.Error())
errs = packer.MultiErrorAppend(errs, &retrieveErr{"network", config.Network, err}) errs = packer.MultiErrorAppend(errs, &retrieveErr{"network", config.Network, err})
} }
} }
@ -92,7 +86,6 @@ func (s *stepPrepareConfig) Run(state multistep.StateBag) multistep.StepAction {
if !isUUID(config.ServiceOffering) { if !isUUID(config.ServiceOffering) {
config.ServiceOffering, _, err = client.ServiceOffering.GetServiceOfferingID(config.ServiceOffering) config.ServiceOffering, _, err = client.ServiceOffering.GetServiceOfferingID(config.ServiceOffering)
if err != nil { if err != nil {
ui.Error(err.Error())
errs = packer.MultiErrorAppend(errs, &retrieveErr{"service offering", config.ServiceOffering, err}) errs = packer.MultiErrorAppend(errs, &retrieveErr{"service offering", config.ServiceOffering, err})
} }
} }
@ -103,7 +96,6 @@ func (s *stepPrepareConfig) Run(state multistep.StateBag) multistep.StepAction {
} else { } else {
config.instanceSource, _, err = client.ISO.GetIsoID(config.SourceISO, "executable", config.Zone) config.instanceSource, _, err = client.ISO.GetIsoID(config.SourceISO, "executable", config.Zone)
if err != nil { if err != nil {
ui.Error(err.Error())
errs = packer.MultiErrorAppend(errs, &retrieveErr{"ISO", config.SourceISO, err}) errs = packer.MultiErrorAppend(errs, &retrieveErr{"ISO", config.SourceISO, err})
} }
} }
@ -115,7 +107,6 @@ func (s *stepPrepareConfig) Run(state multistep.StateBag) multistep.StepAction {
} else { } else {
config.instanceSource, _, err = client.Template.GetTemplateID(config.SourceTemplate, "executable", config.Zone) config.instanceSource, _, err = client.Template.GetTemplateID(config.SourceTemplate, "executable", config.Zone)
if err != nil { if err != nil {
ui.Error(err.Error())
errs = packer.MultiErrorAppend(errs, &retrieveErr{"template", config.SourceTemplate, err}) errs = packer.MultiErrorAppend(errs, &retrieveErr{"template", config.SourceTemplate, err})
} }
} }
@ -127,7 +118,6 @@ func (s *stepPrepareConfig) Run(state multistep.StateBag) multistep.StepAction {
types, err := client.GuestOS.ListOsTypes(p) types, err := client.GuestOS.ListOsTypes(p)
if err != nil { if err != nil {
ui.Error(err.Error())
errs = packer.MultiErrorAppend(errs, &retrieveErr{"OS type", config.TemplateOS, err}) errs = packer.MultiErrorAppend(errs, &retrieveErr{"OS type", config.TemplateOS, err})
} }
if err == nil && types.Count != 1 { if err == nil && types.Count != 1 {
@ -144,6 +134,7 @@ func (s *stepPrepareConfig) Run(state multistep.StateBag) multistep.StepAction {
// nil interface. // nil interface.
if errs != nil && len(errs.Errors) > 0 { if errs != nil && len(errs.Errors) > 0 {
state.Put("error", errs) state.Put("error", errs)
ui.Error(errs.Error())
return multistep.ActionHalt return multistep.ActionHalt
} }