opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-25 10:16:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,632 Commits 30 Branches 710 Tags
2d863896854beee27168f5dd2f00aafb9dbe1131
Commit Graph
4632 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
wanyaoqi 2d86389685 fix disk resize 2019-03-13 11:42:06 +08:00
周有松 f0f6172156 Merge pull request #1220 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.6.0 
* commit '4b4c86b88304cfaf978082646567ba7aff569a1f':
  lbagent: fix corpus versioning
  mcclient: options: ignore ID when converting to params
  lbagent: telegraf: add params influx_db_output_unsafe_ssl
  mcclient: lbagent: allow setting telegraf config template
  lb: 不记录来自lbagent的GET查询请求
  treewide: s/HasSystemAdminPrivelege/HasSystemAdminPrivilege/g
 2019-03-12 16:47:25 +08:00
Yousong Zhou 4b4c86b883 lbagent: fix corpus versioning 2019-03-12 03:39:20 +00:00
Yousong Zhou fef63230ac mcclient: options: ignore ID when converting to params 2019-03-12 03:39:20 +00:00
Yousong Zhou 8016a27abf lbagent: telegraf: add params influx_db_output_unsafe_ssl 2019-03-12 03:39:20 +00:00
Yousong Zhou c6648ed0da mcclient: lbagent: allow setting telegraf config template 2019-03-12 03:39:20 +00:00
Yousong Zhou c6e4fff0d0 lb: 不记录来自lbagent的GET查询请求 
要求

 - _orig=lbagent
 - userCred.HasSystemAdminPrivilege()
 2019-03-12 03:39:20 +00:00
Yousong Zhou 07f98779ad treewide: s/HasSystemAdminPrivelege/HasSystemAdminPrivilege/g 2019-03-12 03:39:20 +00:00
邱剑 36786805bd Merge pull request #1219 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-image-list-show-mindisk to release/2.6.0 
* commit '61a0164f72208f6bd732201490926b53139c9081':
  fix: image list show mindisk field
 2019-03-11 21:42:53 +08:00
Qiu Jian 61a0164f72 fix: image list show mindisk field 2019-03-11 21:41:23 +08:00
周有松 734a9d4731 Merge pull request #1218 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-zone-add-host-filter to release/2.6.0 
* commit 'ce96f911919ca26bf6d91027f5335102c38ee8d9':
  fix: zone add filter by host
 2019-03-11 20:24:29 +08:00
Qiu Jian ce96f91191 fix: zone add filter by host 2019-03-11 20:22:47 +08:00
邱剑 99e2c939a5 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '8dacd50d0e7c995d7d4927f3c90a54046d1e52a8':
  修复2.5未自动合并2.4代码更改
 2019-03-11 18:28:42 +08:00
邱剑 8dacd50d0e Merge pull request #1217 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-server-create-with-disk to release/2.5.0 
* commit 'aea7a72abe703dfdd77c5ad2aab09583f064a62d':
  修复2.5未自动合并2.4代码更改
 2019-03-11 18:28:42 +08:00
屈轩 aea7a72abe 修复2.5未自动合并2.4代码更改 2019-03-11 18:27:08 +08:00
邱剑 39af7f16b5 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'a291bd687813f494073e480f0c19cc63058c63fa':
  跟随主机创建的磁盘默认都是auto delete
 2019-03-11 18:14:17 +08:00
邱剑 a291bd6878 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '7ee3f025ae382b2ca0e7113e50ffffdf33693400':
  跟随主机创建的磁盘默认都是auto delete
 2019-03-11 18:14:17 +08:00
邱剑 7ee3f025ae Merge pull request #1211 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-server-disk-autodelete to release/2.4.0 
* commit 'bf3546109ca6ed849c0f715daa94fa66b57663e5':
  跟随主机创建的磁盘默认都是auto delete
 2019-03-11 18:14:16 +08:00
邱剑 6ec6b2cf6c Merge pull request #1214 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-conflict-k to release/2.6.0 
* commit 'c5d7189b1b7e6ecf9a3ed85191f65b1e731dc94c':
  尽可能的同步openstack host信息
 2019-03-11 18:09:30 +08:00
邱剑 041d79c959 Merge pull request #1196 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-prepaid-guest-renew to release/2.6.0 
* commit '12cd111af41b15a67cb471234d1df19310126468':
  huawei renew bugfix
  add auto renew consts
  add huawei renew isntance
 2019-03-11 18:09:08 +08:00
屈轩 c5d7189b1b 冲突解决 2019-03-11 17:56:55 +08:00
TangBin 12cd111af4 huawei renew bugfix 2019-03-11 17:54:28 +08:00
邱剑 c80ebefaca Merge pull request #1194 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-flavor to release/2.6.0 
* commit 'cc6aff8743e5d0bfc7223e3c9c25b04bcb2f4917':
  openstack: 不创建flavor,仅查找合适的套餐
  避免创建flavor时重名
 2019-03-11 17:24:12 +08:00
邱剑 9024bfe508 Merge pull request #1199 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-rbd-storage-simple to release/2.6.0 
* commit 'fccb9218fc56d6d230469e4d5f6bd99bc7294ff0':
  优化命令结构
  优化获取ceph storage存储大小方式
 2019-03-11 17:22:25 +08:00
邱剑 4a655258ca Merge pull request #1203 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-image-kilo to release/2.6.0 
* commit '12b8a66358a9f53cb565da165111f299ab53c665':
  openstack忽略已存在的安全组规则创建错误
  修复k版openstack不支持id=in:参数
 2019-03-11 17:20:45 +08:00
邱剑 07193fe9d9 Merge pull request #1205 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-host to release/2.5.0 
* commit '42589ad68ff78a6bbb6ef59fc1e2135ec9c43229':
  尽可能的同步openstack host信息
 2019-03-11 17:20:10 +08:00
邱剑 3fd8e99260 Merge pull request #1195 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-storage-attach-log to release/2.6.0 
* commit '079e39def02adb336dc52390bae61c5f64e81c3d':
  如果挂载磁盘失败, 记录失败日志
 2019-03-11 17:06:57 +08:00
屈轩 bf3546109c 跟随主机创建的磁盘默认都是auto delete 2019-03-11 16:09:49 +08:00
邱剑 05096909ed Merge pull request #1206 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-nic-binding-support to release/2.6.0 
* commit '5fbebfaa817feb92f45a4f967e65afe37e49e2ac':
  fix: RHEL fsdirver fail to deploy networking scripts
  feature: nic binding support
 2019-03-11 14:54:20 +08:00
邱剑 4470e77349 Merge pull request #1207 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-nic-bongding-support-region to release/2.6.0 
* commit '2552c658c47f58fcee7e563471da6811a815ac97':
  fix: recode host.getWiresOfId
  Make minimal sysdisk size to 10G
  feature: nic bonding/teaming support on region
 2019-03-11 14:54:00 +08:00
Qiu Jian 2552c658c4 fix: recode host.getWiresOfId 2019-03-11 14:32:36 +08:00
屈轩 cc6aff8743 openstack: 不创建flavor,仅查找合适的套餐 2019-03-11 10:43:57 +08:00
屈轩 fccb9218fc 优化命令结构 2019-03-11 10:38:18 +08:00
TangBin 7d74947202 add auto renew consts 2019-03-11 10:13:13 +08:00
Qiu Jian 621ac5f6af Make minimal sysdisk size to 10G 2019-03-11 09:48:00 +08:00
Qiu Jian 5fbebfaa81 fix: RHEL fsdirver fail to deploy networking scripts 2019-03-11 09:35:31 +08:00
Qiu Jian 7bdab6e02d feature: nic bonding/teaming support on region 2019-03-11 04:45:34 +08:00
Qiu Jian 53435a2528 feature: nic binding support 2019-03-11 04:43:12 +08:00
周有松 641db5ae2d Merge pull request #1200 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fail-to-pxe-bool-preregistered-baremetal to release/2.6.0 
* commit '6646ec8936a5bf1f61360d075a665a82efd4df3d':
  fix: baremetal pxeboot fail to find record of preregistered baremetal
 2019-03-10 13:52:15 +08:00
屈轩 42589ad68f 尽可能的同步openstack host信息 2019-03-09 14:37:07 +08:00
屈轩 12b8a66358 openstack忽略已存在的安全组规则创建错误 2019-03-09 14:17:19 +08:00
屈轩 dd286d6b7e 修复k版openstack不支持id=in:参数 2019-03-09 13:26:06 +08:00
Qiu Jian 6646ec8936 fix: baremetal pxeboot fail to find record of preregistered baremetal 2019-03-08 21:36:46 +08:00
万垚奇 eb82534279 Merge pull request #1198 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-duplicate-jointitem-create to release/2.5.0 
* commit '57a2a475efaea7b5b5af7438af9f6c5115d8fdae':
  修复: joint 的对象创建时没有检验是否存在，会被重复添加
 2019-03-08 21:26:05 +08:00
万垚奇 1649454d3f Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'eb825342799c2b4a43a822cba84b0906887cd35f':
  修复: joint 的对象创建时没有检验是否存在，会被重复添加
 2019-03-08 21:26:05 +08:00
邱剑 7032617d78 Merge pull request #1191 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-renew-prepaid-recycle-sanity-check to release/2.6.0 
* commit 'e62ceb5007e57d71e4f049640528b91a20ae86f6':
  show expired_at colume for host
  fix: validate host status before doing renew prepaid recycle
 2019-03-08 21:07:05 +08:00
屈轩 33aa2e8a9e 优化获取ceph storage存储大小方式 2019-03-08 19:52:52 +08:00
Zexi Li 57a2a475ef 修复: joint 的对象创建时没有检验是否存在，会被重复添加 2019-03-08 19:08:35 +08:00
TangBin 9f81a2b8dc add huawei renew isntance 2019-03-08 18:07:24 +08:00
屈轩 079e39def0 如果挂载磁盘失败, 记录失败日志 2019-03-08 16:46:21 +08:00