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

feature: add create tags for vm and volume

This commit is contained in:
Marin Salinas 2019-03-06 14:04:25 -06:00 committed by Megan Marsh
parent ff0336965b
commit 8a6faf1ad3
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
builder/osc/common/step_run_source_vm.go
View File

@ -98,13 +98,13 @@ func (s *StepRunSourceVm) Run(ctx context.Context, state multistep.StateBag) mul
return multistep.ActionHalt return multistep.ActionHalt
} }
// volTags, err := s.VolumeTags.OAPITags(s.Ctx, oapiconn.GetConfig().Region, state) volTags, err := s.VolumeTags.OAPITags(s.Ctx, oapiconn.GetConfig().Region, state)
// if err != nil { if err != nil {
// err := fmt.Errorf("Error tagging volumes: %s", err) err := fmt.Errorf("Error tagging volumes: %s", err)
// state.Put("error", err) state.Put("error", err)
// ui.Error(err.Error()) ui.Error(err.Error())
// return multistep.ActionHalt return multistep.ActionHalt
// } }
subregion := state.Get("subregion_name").(string) subregion := state.Get("subregion_name").(string)
runOpts := oapi.CreateVmsRequest{ runOpts := oapi.CreateVmsRequest{
@ -125,7 +125,7 @@ func (s *StepRunSourceVm) Run(ctx context.Context, state multistep.StateBag) mul
// } // }
// Collect tags for tagging on resource creation // Collect tags for tagging on resource creation
// var tagSpecs []oapi.ResourceTag // var tagSpecs []oapi.ResourceTag
// if len(oapiTags) > 0 { // if len(oapiTags) > 0 {
// runTags := &oapi.ResourceTag{ // runTags := &oapi.ResourceTag{
@ -185,6 +185,7 @@ func (s *StepRunSourceVm) Run(ctx context.Context, state multistep.StateBag) mul
return multistep.ActionHalt return multistep.ActionHalt
} }
vmId = runResp.OK.Vms[0].VmId vmId = runResp.OK.Vms[0].VmId
volumeId := runResp.OK.Vms[0].BlockDeviceMappings[0].Bsu.VolumeId
// Set the vm ID so that the cleanup works properly // Set the vm ID so that the cleanup works properly
s.vmId = vmId s.vmId = vmId
@ -204,7 +205,25 @@ func (s *StepRunSourceVm) Run(ctx context.Context, state multistep.StateBag) mul
return multistep.ActionHalt return multistep.ActionHalt
} }
//TODO:Set Vm and Volume Tags, //Set Vm tags and vollume tags
if len(oapiTags) > 0 {
if err := CreateTags(oapiconn, s.vmId, ui, oapiTags); err != nil {
err := fmt.Errorf("Error creating tags for vm (%s): %s", s.vmId, err)
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}
}
if len(volTags) > 0 {
if err := CreateTags(oapiconn, volumeId, ui, volTags); err != nil {
err := fmt.Errorf("Error creating tags for volume (%s): %s", volumeId, err)
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}
}
//TODO: LinkPublicIp i //TODO: LinkPublicIp i
resp, err := oapiconn.POST_ReadVms(request) resp, err := oapiconn.POST_ReadVms(request)