opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 07:21:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,149 Commits 30 Branches 714 Tags
89c2421bf739b494dce290b28bb3ea59cdc2fbaa
Commit Graph
2664 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
邱剑 6b615838a2 Merge pull request #1003 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-host-add-kvm-online-resize-disk-func to release/2.6.0 
* commit '459a358ed100d76ef1a6bc165800558aa662c088':
  Feature：add kvm online resize disk handlers
 2019-01-30 21:11:44 +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 29d0f3cfed fix: baremetal dhcp request filter networks with private cloud ONLY 2019-01-30 20:55:22 +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
邱剑 f8779d414f Merge pull request #999 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-stage-2-fix to release/2.6.0 
* commit '852d6ad343e940be1f08145b89be3f6b78a504d4':
  fix rule validate
 2019-01-30 17:14:59 +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
TangBin d862cd1a16 enable batch* interface 2019-01-30 12:16:26 +08:00
屈轩 24514642be 避免未传递backend时,默认是local,不能通过校验 2019-01-30 10:28:51 +08:00
Qiu Jian 459a358ed1 Feature：add kvm online resize disk handlers 2019-01-30 00:40:54 +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
TangBin 852d6ad343 fix rule validate 2019-01-29 10:20:26 +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
邱剑 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
邱剑 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
万垚奇 06446f7783 Merge pull request #35 in ~WANYAOQI/onecloud from ~LIZEXI/onecloud:feature/lzx-baremetal-agent to feature/host-baremetal-v2 
* commit '475c71a3bf5723cb84d566dca05d1bc4bea57e42':
  baremetal: ipmitool passowrd EscapeEchoString
 2019-01-28 18:42:38 +08:00
Zexi Li 475c71a3bf baremetal: ipmitool passowrd EscapeEchoString 2019-01-28 18:41:00 +08:00
wanyaoqi d18f0dbedf add hostmetrics 2019-01-28 18:10:57 +08:00
万垚奇 a8242c6de3 Merge pull request #33 in ~WANYAOQI/onecloud from feature/wyq/host-server-v2 to feature/host-baremetal-v2 
* commit 'cc409c01bbe250938fe5f845043d6e0eaa1b18ce':
  add hostmetrics
  add bsd raw socket code
 2019-01-28 18:06:42 +08:00
wanyaoqi cc409c01bb add hostmetrics 2019-01-28 17:56:19 +08:00
Zexi Li 0c409ae3ab region: host ZoneId and IsBaremetal allow update 2019-01-28 14:18:31 +08:00
李泽玺 a80b2a515c Merge pull request #992 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-conflict-resolve-2.6.0 to release/2.6.0 
* commit 'c1e450f38c6043eec331ab7fafd88ffe0acd70a6':
  修复opentack同步的问题
  climc命令行参数向后兼容，否则yunion-test脚本失败
 2019-01-28 11:21:30 +08:00
Zexi Li dd4c1fe0ae types struct 符合命名规范 2019-01-28 10:06:56 +08:00
Qiu Jian e8445c0d45 修正：httperror没有正确parse错误格式 2019-01-27 18:50:29 +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
屈轩 c1e450f38c 解决冲突 2019-01-26 18:47:47 +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
邱剑 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
屈轩 881ed73ce5 修复opentack同步的问题 2019-01-26 16:45:37 +08:00
Zexi Li d1cd4f3c6d Merge remote-tracking branch 'wyq/feature/host-baremetal-v2' into feature/lzx-baremetal-agent 2019-01-26 16:42:11 +08:00
Zexi Li af143ae2ae 修正：centos 7宿主机格式化的ext4和xfs能够被centos 6虚拟机挂载 2019-01-26 16:40:02 +08:00
wanyaoqi 5f46e7c044 add bsd raw socket code 2019-01-26 16:12:01 +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
wanyaoqi f91f33d696 fix code 2019-01-26 15:55:48 +08:00
wanyaoqi e8306bf602 fix code 2019-01-26 15:51:15 +08:00
wanyaoqi 79f030acf0 dep add gopsutil/mem 2019-01-26 15:45:32 +08:00