Commit Graph

105 Commits

Author SHA1 Message Date
屈轩
7bb46e5990 冲突解决 2019-03-18 10:25:39 +08:00
邱剑
b2105ea5a7 Automatic merge from release/2.4.0 -> release/2.5.0
* commit '25465096a7d8b3c4d4b5935bf0b3e42c75b4b2cc':
  补充esix缺失的ValidateDiskSize
2019-03-18 08:56:36 +08:00
屈轩
0aebfd37a5 补充esix缺失的ValidateDiskSize 2019-03-17 14:43:32 +08:00
Yousong Zhou
8fe4f2ec98 treewide: group imports with goimports
./goimports -w -local yunion.io/x/onecloud/ -corp yunion.io/x/ $GOPATH/src/yunion.io/x/onecloud/{cmd,pkg}
2019-03-13 10:46:12 +00:00
Qiu Jian
7bdab6e02d feature: nic bonding/teaming support on region 2019-03-11 04:45:34 +08:00
屈轩
58ee33c3f0 修正一些错误信息描述 2019-03-07 16:48:15 +08:00
屈轩
0514c725d7 挂载后端校验 2019-03-04 18:42:14 +08:00
邱剑
fb6d410b2a Automatic merge from release/2.4.0 -> release/2.5.0
* commit '2d53d2c569dedbe0d09773b5aca46305331fd68f':
  去除调试信息
  避免过滤cloudprovider失效
2019-02-25 12:27:48 +08:00
邱剑
2347404b3c Automatic merge from release/2.5.0 -> release/2.6.0
* commit 'fb6d410b2a77da9334478155caa728c76301629f':
  去除调试信息
  避免过滤cloudprovider失效
2019-02-25 12:27:48 +08:00
屈轩
9c36d6945a 冲突解决 2019-02-25 12:06:38 +08:00
邱剑
a7db0fe024 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '554f7fa0a07329180a878f3bf9d1fe9e04bd1203':
  去除调试信息
  避免过滤cloudprovider失效
2019-02-25 11:56:01 +08:00
屈轩
7420fddad5 避免过滤cloudprovider失效 2019-02-25 11:37:16 +08:00
屈轩
27ce557a57 openstack 同步flavor 2019-02-16 17:38:30 +08:00
屈轩
d85e2f8162 openstack创建 2019-02-16 17:37:33 +08:00
Qiu Jian
3319bab2e1 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190216
Conflicts:
	pkg/cloudcommon/db/opslog.go
2019-02-16 14:08:56 +08:00
Qiu Jian
6de65ba419 fix: converted host configuration always use http as keystone protocol 2019-02-15 23:05:30 +08:00
Qiu Jian
e59157e3b3 fix: baremetal host driver interface change break build 2019-02-14 18:42:10 +08:00
邱剑
55ec95f0ac Merge pull request #1032 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/delete-backup-server to release/2.6.0
* commit '0022d65b001c71d5d59d62de581200e6ff2708d1':
  add delete backup guest, fix bugs
2019-02-13 21:24:17 +08:00
邱剑
d0f2bfcad0 Automatic merge from release/2.5.0 -> release/2.6.0
* commit 'e38f007c512e27f00630a34629006067660b6db8':
  implement baremetal host driver
  minor updates
2019-02-13 18:26:58 +08:00
Qiu Jian
4bca4b1e6e implement baremetal host driver 2019-02-13 18:23:57 +08:00
wanyaoqi
0022d65b00 add delete backup guest, fix bugs 2019-02-12 20:56:08 +08:00
Qiu Jian
137c0d41df fix: fix issues preventing clean_provider.sh from clean cloud provider
records
2019-02-12 20:40:11 +08:00
Qiu Jian
f2d3460bad update make fmt 2019-01-26 02:20:38 +08:00
Qiu Jian
c6eaa4ad9b 改进:允许kvm虚拟机在不关机状态下调整磁盘 2019-01-26 02:17:59 +08:00
TangBin
d0bb6a894d merge release/2.6.0 2019-01-23 11:14:39 +08:00
Qiu Jian
beb2ac66b5 增加:1. 将公有云标准镜像同步到本地 2. 可以从公有云标准镜像创建主机 3.
在公有云缓存镜像时遵守公有云镜像的配额
2019-01-21 09:21:02 +08:00
唐斌
919f164f95 huawei support stage 2 2019-01-19 17:58:00 +08:00
屈轩
418c4620a1 补充openstack driver 2019-01-06 14:11:37 +08:00
Qiu Jian
e5aa26f0af 修正:1. storagecache.CacheImage接口需要指定format 2.
PerformAction默认返回ActionNotFound Error
2019-01-04 17:36:54 +08:00
邱剑
1a44405e1b Merge pull request #865 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-esxiagent-support to release/2.5.0
* commit '1061b47afd0a060091a5fbd5526b295d05db4e60':
  修正:镜像通过PUT接口上传后,需要启动image convert tasks
  支持esxi agent,创建主机缺省用vmdk格式的镜像
2019-01-02 21:05:58 +08:00
Qiu Jian
1061b47afd 修正:镜像通过PUT接口上传后,需要启动image convert tasks 2019-01-02 17:13:47 +08:00
Qiu Jian
0eb41d636a 支持esxi agent,创建主机缺省用vmdk格式的镜像 2019-01-02 02:54:54 +08:00
tangbin
764eb09481 merge release/2.5.0 2019-01-01 17:00:23 +08:00
tangbin
66e3e05acd merge 2019-01-01 16:34:35 +08:00
TangBin
3b91a27fc9 huawei cloud sync 2019-01-01 16:21:37 +08:00
Qiu Jian
21558d3dd2 final commit
Conflicts:
	pkg/cloudcommon/policy/policy.go
	pkg/util/azure/storagecache.go
2018-12-26 23:02:19 +08:00
wanyaoqi
742a67b0f8 client session add context 2018-12-25 13:33:33 +08:00
TangBin
ed3deb02bc disk rollback bugfix 2018-12-18 16:48:40 +08:00
TangBin
060660a1ea system disk resize 2018-12-14 11:50:54 +08:00
Qiu Jian
8c597cf135 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-vmware-vcenter-test 2018-12-12 23:29:16 +08:00
Qiu Jian
46aaba2474 make fmt 2018-12-12 23:24:34 +08:00
Qiu Jian
4bd67d60ee 修正:由于datastore url信息不一致导致通过vcenter创建主机失败 2018-12-12 01:23:48 +08:00
wanyaoqi
6a6806e65b server create disk by snapshot, mount snapshot by fusefs 2018-12-11 20:46:36 +08:00
Qiu Jian
cc7da24faa Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-10 01:08:09 +08:00
Qiu Jian
b69bc264a2 修正:1. 多余1个磁盘的recycle主机创建失败 2018-12-08 10:29:16 +08:00
Qiu Jian
965e84ea36 update 2018-12-07 02:57:58 +08:00
屈轩
d6ff02f2c5 修复: 通用磁盘回滚方法 2018-12-06 14:17:17 +08:00
屈轩
b0bbfb0f1a 解决冲突 2018-12-04 20:27:12 +08:00
屈轩
3fa55efe42 腾讯云导入镜像适配 2018-12-04 18:50:58 +08:00
Qiu Jian
fe7d54e6cb fix aws missing init 2018-12-03 07:36:30 +08:00