opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,149 Commits 30 Branches 714 Tags
89c2421bf739b494dce290b28bb3ea59cdc2fbaa
Commit Graph
1406 Commits
Author SHA1 Message Date
Qiu Jian 89c2421bf7 minor fixes 2019-02-11 08:46:06 +08:00
Qiu Jian ff4709e066 增加：补充完整通知消息功能 2019-02-08 07:42:53 +08:00
Qiu Jian 6f8ce3b32d Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-network-type-pxe-ipmi 
Conflicts:
	cmd/climc/shell/networks.go
 2019-01-30 22:19:29 +08:00
邱剑 c7da5787cf Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '6970baa2a08950319069a44d75df4c4272bac775':
  1. network-list add is_private/is_public filter 2. set default image quota to 10
 2019-01-30 21:11:11 +08:00
邱剑 36414fb937 Merge pull request #1009 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/reserve-ips-and-order-by-disk-size to release/2.6.0 
* commit 'bbfed827dc0b0fb1756d01fcac49244679720a15':
  - reserve mutli ip; - server-list order by disk
 2019-01-30 21:10:29 +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
wanyaoqi bbfed827dc - reserve mutli ip; - server-list order by disk 2019-01-30 20:32:04 +08:00
屈轩 609be1282c 避免获取region失败导致内存异常访问 2019-01-30 18:17:36 +08:00
邱剑 cf965a311a Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'bc466f02fde2fef0c2f64b6ebb50f4b33cbc7c33':
  避免未传递backend时,默认是local,不能通过校验
 2019-01-30 17:14:47 +08:00
TangBin f0d8f543d7 enable batch* interface 2019-01-30 14:27:26 +08:00
屈轩 24514642be 避免未传递backend时,默认是local,不能通过校验 2019-01-30 10:28:51 +08:00
Qiu Jian af87d0569f Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-network-type-pxe-ipmi 2019-01-29 23:40:14 +08:00
Qiu Jian 77b95af988 feature: 
1. change SERVER_TYPE_* to NETWORK_TYpE_*
2. add NETWORK_TYPE_PXE and NETWORK_TYPE_IPMI specifically for baremetal PXE and IPMI
network allocation
 2019-01-29 23:38:15 +08:00
邱剑 1b5521ac8a Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'ec4001909afa71ebb1e240cbb77369e2ebde0ce4':
  修正：主机创建选择网络逻辑简化
 2019-01-29 23:36:59 +08:00
邱剑 b78020b332 Merge pull request #993 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-server-change-ipaddr to release/2.6.0 
* commit 'bb9991100eb0986d23aa3fa11a3984903136c87b':
  1. 增加server-change-ipaddr接口，允许在运行和关机更换主机的IP地址。 2. 允许主机加入一个network多次（目前允许2次）
 2019-01-29 19:45:09 +08:00
Qiu Jian b5d43745c8 修正：主机创建选择网络逻辑简化 2019-01-29 18:26:00 +08:00
Qiu Jian bb9991100e Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-server-change-ipaddr 
Conflicts:
	pkg/mcclient/modules/joint.go
 2019-01-28 22:23:49 +08:00
Qiu Jian 0a5ab05562 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20180128-2.6.0 
Conflicts:
	pkg/compute/models/hosts.go
 2019-01-28 21:39:00 +08:00
Qiu Jian e28ac593bc 修正：host-prepare后状态改为prepare 2019-01-28 21:18:54 +08:00
万垚奇 28c0452851 Merge pull request #984 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/host-baremetal-v2 to release/2.6.0 
* commit '06446f778364e97cd2df66d8ed40f3c0c4d6574e': (135 commits)
  baremetal: ipmitool passowrd EscapeEchoString
  add hostmetrics
  add hostmetrics
  types struct 符合命名规范
  修正：centos 7宿主机格式化的ext4和xfs能够被centos 6虚拟机挂载
  add bsd raw socket code
  fix code
  fix code
  dep add gopsutil/mem
  fix dhcp server
  baremetal: quit signal handle
  baremetal: quit signal handle
  fix dhcp server
  gendoc
  remove jsonutils NewPair
  fix qmp montior cmd
  snapshot recycle, disk recycle, dhcp relay use raw socket
  fix code, test migrate snapshot, fix deploy
  add migrate presend arp
  add ethernet pkg
  ...
 2019-01-28 20:04:24 +08:00
邱剑 f64d2ebc64 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '703aaf694bdb0f6dcd0f89bf9db915469326e29a':
  region: host ZoneId and IsBaremetal allow update
 2019-01-28 19:30:46 +08:00
Zexi Li 0c409ae3ab region: host ZoneId and IsBaremetal allow update 2019-01-28 14:18:31 +08:00
Qiu Jian 4cd39a70c0 1. 
增加server-change-ipaddr接口，允许在运行和关机更换主机的IP地址。
2. 允许主机加入一个network多次（目前允许2次）
 2019-01-27 00:30:43 +08:00
邱剑 c97fd82409 Merge pull request #973 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-aws-image-fetch-info to release/2.6.0 
* commit '878bc69358620916304e5c28d6b15d7c20d88756':
  minor updates
  改进：对Aws系统镜像分类处理
 2019-01-26 20:10:17 +08:00
邱剑 32e23a3fb4 Merge pull request #979 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-allow-kvm-running-change-disk to release/2.6.0 
* commit 'f2d3460bad989229d1584a6c3b6beab00681bd10':
  update make fmt
  改进：允许kvm虚拟机在不关机状态下调整磁盘
 2019-01-26 18:00:46 +08:00
周有松 5562e8a528 Merge pull request #939 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-lb-create to release/2.6.0 
* commit '409b376ebdd13086d2a5a7462ab076827dff0f25':
  修正udp,tcp后端服务器组id异常
  添加监听同步配置操作
  统一LoadBalancer函数大小写问题
  添加region driver
 2019-01-26 15:57:03 +08:00
邱剑 50eca7811b Merge pull request #970 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-create-vm to release/2.6.0 
* commit '0a9db10e8356780e7192de1efbe118b3d8f7d0d2':
  优化创建虚机结构
  优化虚机创建方法
 2019-01-26 14:22:03 +08:00
邱剑 e0e7744915 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'ff3f65d821a921cb35d47893c4d0efb4e26151cb':
  避免同步过来的安全组规则ip地址为nil
 2019-01-26 12:16:43 +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
邱剑 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
邱剑 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
邱剑 eb721eead2 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '89254b6b96ed0ae3b342673ce091d978734c2924':
  默认删除routetables
 2019-01-26 12:12:56 +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
邱剑 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
屈轩 c442c275e1 避免同步过来的安全组规则ip地址为nil 2019-01-26 11:48:02 +08:00
万垚奇 d48c4cd6a3 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '46a15c784a5fbf0d269caffd7152dae8fa003232':
  server rebuild root状态没有立即设置，导致yunion-test脚本失败
 2019-01-26 10:47:09 +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
万垚奇 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
万垚奇 2ca0c88850 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '8ee6b55c4418c6089483d7dadbcc926ca167a6ee':
  修正：旧的服务器没有os_type字段
 2019-01-26 10:46:50 +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 f2d3460bad update make fmt 2019-01-26 02:20:38 +08:00
Qiu Jian c6eaa4ad9b 改进：允许kvm虚拟机在不关机状态下调整磁盘 2019-01-26 02:17:59 +08:00
屈轩 f0deb530e5 默认删除routetables 2019-01-25 21:04:04 +08:00
wanyaoqi 60fe104da2 snapshot recycle, disk recycle, dhcp relay use raw socket 2019-01-25 20:32:44 +08:00
邱剑 1175646e4d Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '155858f89e6f50df2864ea2430984c254d70ecf4':
  添加腾讯云创建机器时校验数据盘大小
 2019-01-25 17:14:18 +08:00
屈轩 aaa6ac23ea 添加腾讯云创建机器时校验数据盘大小 2019-01-25 15:43:43 +08:00
屈轩 409b376ebd 修正udp,tcp后端服务器组id异常 2019-01-25 15:00:45 +08:00