opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,715 Commits 27 Branches 687 Tags
c871a3188200ff6aa2d8423d075cd734a55ae73e
Commit Graph
2465 Commits
Author SHA1 Message Date
邱剑 c871a31882 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'a5731134dc8e8b62afbd1f7504f148291ab039ef':
  update: customize system disk size and backend for each hypervisor
 2019-02-15 12:09:44 +08:00
Qiu Jian 543c87fb84 cloudcommon using structarg.ParseArgs2 to parse arguments 2019-02-14 17:31:27 +08:00
Qiu Jian 5ceaaf716e update: customize system disk size and backend for each hypervisor 2019-02-13 23:39:36 +08:00
邱剑 b9b57e8441 Merge pull request #1033 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-image-bugfix-20190213 to release/2.5.0 
* commit 'dd317fb83d6540ba565558acbffdadd1d5ea63ec':
  update vendor
  fix image misc bugs
 2019-02-13 21:44:51 +08:00
Qiu Jian 4bca4b1e6e implement baremetal host driver 2019-02-13 18:23:57 +08:00
Qiu Jian d45003f87d Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-host-convert-sched-failed 2019-02-13 16:10:14 +08:00
Zexi Li e8d8097627 修正: disk 传入 scheduler 参数不对, size_mb 应该为 size 2019-02-13 15:49:29 +08:00
Qiu Jian 8b71e18f2b Merge branch 'hotfix/qj-host-convert-sched-failed' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-host-convert-sched-failed 2019-02-13 15:38:50 +08:00
Qiu Jian b11f117781 minor updates 2019-02-13 15:38:30 +08:00
Zexi Li 1fe2bbe0e0 baremetal: host convert failed 2019-02-13 15:10:10 +08:00
Qiu Jian 924ae176b8 fix: recode host convert codes to fix scheduler failure issues 2019-02-13 14:51:05 +08:00
Qiu Jian 6fccbfcd6e Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.5.0-20190213 
Conflicts:
	pkg/compute/models/guests.go
	pkg/compute/service/service.go
	pkg/compute/tasks/cloud_provider_sync_info_task.go
 2019-02-13 12:01:01 +08:00
Qiu Jian 9bd15451ae fix image misc bugs 2019-02-13 00:10:03 +08:00
Qiu Jian a57733bae8 fix: baremetal driver did not implement StartGuestRestartTask 2019-02-12 15:21:29 +08:00
Qiu Jian 173526ce06 fix: correct VM expiration date before clean expired prepaid VM 2019-02-12 01:02:57 +08:00
Qiu Jian fa7bce7853 make both golang and python option for ssl ca file as ssl_ca_certs 2019-02-11 21:05:36 +08:00
邱剑 6f933566da Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '379e0ac7bc6f64d0a9679cc4998d0abfd68af156':
  删除安全组后先隐藏后删除
 2019-02-11 20:43:38 +08:00
邱剑 cd61e90012 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '6f933566da6f033e430fa0a7f69fd169dbc3b8ce':
  删除安全组后先隐藏后删除
 2019-02-11 20:43:38 +08:00
邱剑 379e0ac7bc Merge pull request #1022 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-delete to release/2.3.0 
* commit 'ccfc1168e00f54cd98a0f484ed3459a2d340d7cd':
  删除安全组后先隐藏后删除
 2019-02-11 20:43:37 +08:00
屈轩 ccfc1168e0 删除安全组后先隐藏后删除 2019-02-11 20:10:27 +08:00
屈轩 2f23eae351 缓存lb endpoint 2019-02-11 14:18:05 +08:00
屈轩 14bc2270f5 请求aliyun负载均衡使用对应的endpoint 2019-02-11 12:01:53 +08:00
Qiu Jian ddde11f4f9 1. network-list add is_private/is_public filter 
2. set default image quota to 10
 2019-01-30 20:50:22 +08:00
屈轩 24514642be 避免未传递backend时,默认是local,不能通过校验 2019-01-30 10:28:51 +08:00
Qiu Jian b5d43745c8 修正：主机创建选择网络逻辑简化 2019-01-29 18:26:00 +08:00
Qiu Jian e28ac593bc 修正：host-prepare后状态改为prepare 2019-01-28 21:18:54 +08:00
邱剑 8ffe91e206 Merge pull request #994 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-json-error-parse to release/2.5.0 
* commit 'e8445c0d452ec46a9947782b06f3ece1d1cf3253':
  修正：httperror没有正确parse错误格式
 2019-01-28 19:31:04 +08:00
Zexi Li 0c409ae3ab region: host ZoneId and IsBaremetal allow update 2019-01-28 14:18:31 +08:00
Qiu Jian e8445c0d45 修正：httperror没有正确parse错误格式 2019-01-27 18:50:29 +08:00
邱剑 a05b1e817e Merge pull request #980 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-make-climc-backward-compatible to release/2.5.0 
* commit '399fbc9bd5893e3136c3641d75dad22b11d97918':
  climc命令行参数向后兼容，否则yunion-test脚本失败
 2019-01-26 18:01:17 +08:00
屈轩 881ed73ce5 修复opentack同步的问题 2019-01-26 16:45:37 +08:00
邱剑 e80ce6369e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '44536b25b0a1f8e6e5663522649f9a4eda4de02e':
  避免同步过来的安全组规则ip地址为nil
 2019-01-26 12:16:42 +08:00
邱剑 44536b25b0 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '6ce5fe078802ced35986f7d443b29642b4a17342':
  避免同步过来的安全组规则ip地址为nil
 2019-01-26 12:16:42 +08:00
邱剑 ff3f65d821 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'e80ce6369eeeea100b3c48810a837828580f9d3d':
  避免同步过来的安全组规则ip地址为nil
 2019-01-26 12:16:42 +08:00
邱剑 6ce5fe0788 Merge pull request #986 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-rule-ip-sync-nil to release/2.2.0 
* commit 'c442c275e1b4c8f20b29e124d05c0a8b93cebddd':
  避免同步过来的安全组规则ip地址为nil
 2019-01-26 12:16:41 +08:00
邱剑 ea34b35e52 Merge pull request #978 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-vpc-delete to release/2.4.0 
* commit 'f0deb530e511c54db2a2f7495a6b2749c6c8a1a5':
  默认删除routetables
 2019-01-26 12:12:55 +08:00
邱剑 89254b6b96 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'ea34b35e52db342d007f672638170bf16ae7930f':
  默认删除routetables
 2019-01-26 12:12:55 +08:00
屈轩 c442c275e1 避免同步过来的安全组规则ip地址为nil 2019-01-26 11:48:02 +08:00
万垚奇 196fefd30e Merge pull request #982 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-server-rebuild-root-status-not-set-immediately to release/2.4.0 
* commit 'ffd02bfd7f49a6327a8ad2828a6097ff7bf71855':
  server rebuild root状态没有立即设置，导致yunion-test脚本失败
 2019-01-26 10:47:08 +08:00
万垚奇 46a15c784a Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '196fefd30e30c23f7bfe6b55cc25b22f1ec13609':
  server rebuild root状态没有立即设置，导致yunion-test脚本失败
 2019-01-26 10:47:08 +08:00
万垚奇 8ee6b55c44 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'e502a1579fcbca49160db3161fa14dac82607d78':
  修正：旧的服务器没有os_type字段
 2019-01-26 10:46:49 +08:00
Qiu Jian 0f0698ea7e 修正：旧的服务器没有os_type字段 2019-01-26 10:42:40 +08:00
Qiu Jian ffd02bfd7f server rebuild root状态没有立即设置，导致yunion-test脚本失败 2019-01-26 03:34:20 +08:00
Qiu Jian 399fbc9bd5 climc命令行参数向后兼容，否则yunion-test脚本失败 2019-01-26 03:31:26 +08:00
屈轩 f0deb530e5 默认删除routetables 2019-01-25 21:04:04 +08:00
wanyaoqi 65ac44f3e9 fix disk-list 2019-01-25 17:29:26 +08:00
屈轩 aaa6ac23ea 添加腾讯云创建机器时校验数据盘大小 2019-01-25 15:43:43 +08:00
邱剑 ab46f9fcdf Merge pull request #972 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyun-create-validate-disk-size to release/2.5.0 
* commit '6ae236e6501f63ff26e364b6e408c769a5f45f11':
  阿里云创建时校验云盘大小
 2019-01-25 14:54:14 +08:00
周有松 700d9229c7 Merge pull request #962 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-lb-sync to release/2.5.0 
* commit 'f6481b73633741cead155b97d2e01c7ee3b2221c':
  修复lb同步时的一些小问题
 2019-01-25 12:42:55 +08:00
万垚奇 e477d9e8c8 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '94375a89a6e78d495717dfb637c6894631aac9ab':
  修正: server 卸载 gpu 不生效
 2019-01-25 11:23:59 +08:00