Commit Graph
6987 Commits
Author SHA1 Message Date
邱剑 e08c511bb4 Merge pull request #751 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-ignore-data-disk-rebuild-failure to release/2.4.0
* commit 'f262783db644e2f48afaa147acb5f26cf9059267':
  暂时忽略rebuild data disk的错误
2018-12-13 18:38:57 +08:00
邱剑 0d32748db8 Merge pull request #752 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-optimize-fetch-cloud-provider-info to release/2.4.0
* commit '0f4729ae506f18f66ea730f8cedc011da38525e0':
  改进:获取provider/region ext id/zone ext id不需要访问cloud provider driver,提高访问效率
2018-12-13 18:18:12 +08:00
Yousong Zhou 114f7c721e climc: 将xx-list --{provider,manager,account}放到BaseListOptions 2018-12-13 09:51:19 +00:00
TangBin 34ed406ddd add clean invalid sku job 2018-12-13 17:44:48 +08:00
Yousong Zhou 9a8b9bf7b1 mcclient: options: routetables: fix compilation 2018-12-13 09:39:01 +00:00
TangBin fb94b43dc2 fix instance type list marshal error 2018-12-13 16:26:42 +08:00
TangBin 3610828f94 instance type字段误写成了id 2018-12-13 15:51:42 +08:00
zhengjiajie 1ee2e783aa zhengjj submit 4 files 2018-12-13 14:51:35 +08:00
Qiu Jian 0f4729ae50 改进:获取provider/region ext id/zone ext id不需要访问cloud provider
driver,提高访问效率
2018-12-13 12:35:20 +08:00
Qiu Jian f262783db6 暂时忽略rebuild data disk的错误 2018-12-13 12:18:44 +08:00
邱剑 17aa485093 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '4ec6a728f9132ed87a3d386afe5bd839c6f6e8b8':
  fix: gpu server not work
2018-12-13 11:54:52 +08:00
Zexi Li 55a8c869f7 fix: gpu server not work 2018-12-13 11:53:54 +08:00
邱剑 7c7bf5c4c2 Merge pull request #747 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-create-disk-by-snapshot to release/2.4.0
* commit 'd74b2390dabe930cc850dacc30c80d15bbce27b3':
  fix import C use env CFLAGS
2018-12-13 11:35:14 +08:00
wanyaoqi d74b2390da fix import C use env CFLAGS 2018-12-13 10:31:48 +08:00
TangBin bde6a55cc8 修复io1卷主机不能正常创建的问题 2018-12-13 10:23:32 +08:00
Qiu Jian e7b978955c set cmtbound for storage & cpu & memory 2018-12-12 23:34:52 +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 4ede254c1d Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-region-geographicinfo 2018-12-12 22:56:19 +08:00
Qiu Jian 8f11b765d9 1.
对disk/elasticip/networks/snapshot/storages/vpc/wire/routetable/servers等支持manager/account/provider过滤查询
2. 详情增加SCloudProviderInfo信息
2018-12-12 22:53:13 +08:00
Yousong Zhou 91f61d6b7e guests: 允许purge预付费虚机记录 2018-12-12 14:20:43 +00:00
Yousong Zhou 010cafa4c5 routetables: routetable-purge支持 2018-12-12 14:20:43 +00:00
Yousong Zhou b736983fe9 routetables: routetable-list --manager <provider-id>支持 2018-12-12 14:20:43 +00:00
屈轩 9473893d77 冲突解决 2018-12-12 21:37:03 +08:00
屈轩 6590a00f2a 冲突解决 2018-12-12 21:36:17 +08:00
邱剑 c1fca5e883 Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'c82e4da35fde0bba71279e66f11ef8128aade241':
  避免同步cache中的安全组
2018-12-12 21:24:22 +08:00
屈轩 064d082ef2 解决冲突 2018-12-12 21:23:23 +08:00
邱剑 90b250c2da Merge pull request #717 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-create-disk-by-snapshot to release/2.4.0
* commit 'ad2de3384697067d40a68e06e7870c2a9e9612b3':
  fix code
  add snapshot reference count, fix code
  server create disk by snapshot, mount snapshot by fusefs
2018-12-12 21:15:19 +08:00
邱剑 516c39a614 Merge pull request #740 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0
* commit '1a7283b8470f3d39c00df1b3bcf8d74f28ede890':
  loadbalancers: 使用ApplyModelFilters()
  validators: 添加ApplyModelFilters()
  loadbalancerlisteners: 改正update enable_http2
  lbagent: 仅处理manager_id为空的API对象
  gofmt
2018-12-12 21:14:07 +08:00
邱剑 f26634c6ee Automatic merge from release/2.3.0 -> release/2.4.0
* commit '516c39a6144b5558505fa6669d70a8cf4ad3b496':
  loadbalancers: 使用ApplyModelFilters()
  validators: 添加ApplyModelFilters()
  loadbalancerlisteners: 改正update enable_http2
  lbagent: 仅处理manager_id为空的API对象
  gofmt
2018-12-12 21:14:07 +08:00
邱剑 52ff998385 Merge pull request #742 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-undo-recycle-duplicate-external-id to release/2.4.0
* commit '33e0269d081ab3a0afe7b2501ec032b502ef95ec':
  minor fixes
  修正:prepaid recycle host的storage driver设置为Linux
  修正:host-undo-recycle fail
2018-12-12 21:03:20 +08:00
邱剑 13ecb06f9c Merge pull request #738 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-always-enable-sched-policy to release/2.4.0
* commit '09750de93436edac99890b252b7b4e1f0cd5b12b':
  总是允许使用调度标签,无论公有云还是私有云
2018-12-12 21:02:34 +08:00
邱剑 4ee5b2f092 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '4db82c95608cea2856ca7485637af1dd6bba03fc':
  region: server deploy 和 save-image 操作后自动重启
2018-12-12 21:01:48 +08:00
Qiu Jian 33e0269d08 minor fixes 2018-12-12 21:01:02 +08:00
Zexi Li 5f3d452017 region: server deploy 和 save-image 操作后自动重启 2018-12-12 20:51:18 +08:00
Zexi Li 2c5ed4b360 scheduler: make schedtag prefer and avoid strategy work 2018-12-12 19:56:21 +08:00
Qiu Jian 75f04cae51 修正:prepaid recycle host的storage driver设置为Linux 2018-12-12 19:55:35 +08:00
TangBin 3d320cb6c6 主机删除问题修复 2018-12-12 19:41:53 +08:00
TangBin 61d1a7258f 主机删除问题修复 2018-12-12 19:27:30 +08:00
Qiu Jian daa0d7a65d Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-host-undo-recycle-duplicate-external-id 2018-12-12 19:23:38 +08:00
Qiu Jian e0d7cbb431 修正:host-undo-recycle fail 2018-12-12 19:23:03 +08:00
TangBin 13fae52ea3 名称同步等问题修复 2018-12-12 18:56:44 +08:00
Zexi Li b64c3b3333 region: specs panic when host sysinfo is nil 2018-12-12 17:46:56 +08:00
屈轩 7a3ddc7caf 避免同步cache中的安全组 2018-12-12 17:01:14 +08:00
Qiu Jian 09750de934 总是允许使用调度标签,无论公有云还是私有云 2018-12-12 16:51:59 +08:00
Yousong Zhou 1a7283b847 loadbalancers: 使用ApplyModelFilters() 2018-12-12 08:50:57 +00:00
Yousong Zhou 35384160ce validators: 添加ApplyModelFilters() 2018-12-12 08:50:57 +00:00
Yousong Zhou c6dd234676 loadbalancerlisteners: 改正update enable_http2 2018-12-12 08:50:57 +00:00
Yousong Zhou 4f107ee02c lbagent: 仅处理manager_id为空的API对象
当前还没有manager_id字段,先留出
2018-12-12 08:47:04 +00:00
Yousong Zhou 1d013215b3 gofmt 2018-12-12 08:47:04 +00:00