lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-06-08 07:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

Browse Source 
Conflicts:
	pkg/compute/guestdrivers/aws.go
This commit is contained in:
Qiu Jian
2019-03-07 15:22:58 +08:00
parent 1efbd1e89c 09fe040285
commit 52ab56fa3f
24 changed files with 323 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/util/openstack/disk.go
View File

@@ -230,11 +230,11 @@ func (disk *SDisk) GetMountpoint() string {
func (region *SRegion) CreateDisk(zoneName string, category string, name string, sizeGb int, desc string) (*SDisk, error) {
params := map[string]map[string]interface{}{
"volume": {
"size": sizeGb,
"volume_type": category,
"name": name,
"description": desc,
"availability_zone": zoneName,
"size": sizeGb,
"volume_type": category,
"name": name,
"description": desc,
//"availability_zone": zoneName,
},
}
_, resp, err := region.CinderCreate("/volumes", "", jsonutils.Marshal(params))

7
pkg/util/openstack/instance.go
View File

@@ -380,8 +380,11 @@ func (instance *SInstance) DeployVM(ctx context.Context, name string, password s
}
func (instance *SInstance) RebuildRoot(ctx context.Context, imageId string, passwd string, publicKey string, sysSizeGB int) (string, error) {
return "", instance.host.zone.region.ReplaceSystemDisk(instance.ID, imageId, passwd, publicKey, sysSizeGB)
sysDiskId := ""
if len(instance.VolumesAttached) > 0 {
sysDiskId = instance.VolumesAttached[0].ID
}
return sysDiskId, instance.host.zone.region.ReplaceSystemDisk(instance.ID, imageId, passwd, publicKey, sysSizeGB)
}
func (instance *SInstance) ChangeConfig(ctx context.Context, ncpu int, vmem int) error {

2
pkg/util/openstack/storage.go
View File

@@ -96,7 +96,7 @@ func (storage *SStorage) GetIStoragecache() cloudprovider.ICloudStoragecache {
}
func (storage *SStorage) CreateIDisk(name string, sizeGb int, desc string) (cloudprovider.ICloudDisk, error) {
disk, err := storage.zone.region.CreateDisk(storage.zone.ZoneName, storage.Name, name, sizeGb, desc)
disk, err := storage.zone.region.CreateDisk("", storage.Name, name, sizeGb, desc)
if err != nil {
log.Errorf("createDisk fail %v", err)
return nil, err