opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 06:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
TangBin
2018-10-29 17:50:51 +08:00
parent d3e5b17a6b
commit 2629b64b88
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/aws/instance.go
+3 -3
View File
@@ -667,20 +667,20 @@ func (self *SRegion) ChangeVMConfig(zoneId string, instanceId string, ncpu int,
return nil
}
func (self *SRegion) DetachDisk(instanceId string, diskId string, deviceName string) error {
func (self *SRegion) DetachDisk(instanceId string, diskId string) error {
params := &ec2.DetachVolumeInput{}
params.SetInstanceId(instanceId)
params.SetVolumeId(diskId)
params.SetDevice(deviceName)
_, err := self.ec2Client.DetachVolume(params)
return err
}
func (self *SRegion) AttachDisk(instanceId string, diskId string) error {
func (self *SRegion) AttachDisk(instanceId string, diskId string, deviceName string) error {
params := &ec2.AttachVolumeInput{}
params.SetInstanceId(instanceId)
params.SetVolumeId(diskId)
params.SetDevice(deviceName)
_, err := self.ec2Client.AttachVolume(params)
return err
pkg/util/aws/shell/instance.go
+8 -2
View File
@@ -52,8 +52,14 @@ func init() {
DISK string `help:"disk ID"`
}
shellutils.R(&InstanceDiskOperationOptions{}, "instance-attach-disk", "Attach a disk to instance", func(cli *aws.SRegion, args *InstanceDiskOperationOptions) error {
err := cli.AttachDisk(args.ID, args.DISK)
type InstanceDiskAttachOptions struct {
ID string `help:"instance ID"`
DISK string `help:"disk ID"`
DEVICE string `help:"disk device name. eg. /dev/sdb"`
}
shellutils.R(&InstanceDiskAttachOptions{}, "instance-attach-disk", "Attach a disk to instance", func(cli *aws.SRegion, args *InstanceDiskOperationOptions) error {
err := cli.AttachDisk(args.ID, args.DISK, args.DEVICE)
if err != nil {
return err
}