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
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
Zexi Li b59b1c4519 region: host 支持通过 set-schedtag 接口添加删除调度标签 2019-01-14 12:32:18 +08:00
Qiu Jian 706238404e 修正：1. 包年包月资源池添加和减少操作需要做状态检查 2. 
同步时候忽略包年包月资源次的host和storage
 2019-01-11 21:13:40 +08:00
邱剑 befa02f7b1 Merge pull request #915 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secrule-port to release/2.5.0 
* commit 'bdcbd2a8f48b1e25971fa055bc92f9e330ab0c6d':
  避免参数ports未生效问题
 2019-01-11 12:28:44 +08:00
Zexi Li b82290d124 修复: spec 显示没有 enabled 的宿主机 2019-01-10 22:40:15 +08:00
邱剑 f61434aaf5 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'c5e96e7c1f6a99c6a9ac59f9f1a39ed098eb50b4':
  修复: spec 显示没有 enabled 的宿主机
 2019-01-10 22:35:20 +08:00
屈轩 bdcbd2a8f4 避免参数ports未生效问题 2019-01-10 20:11:43 +08:00
Zexi Li 986e22c5fa baremetal: raid driver abstract 2019-01-10 20:00:46 +08:00
邱剑 b31db23acf Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '082b003451edd9ad303b328494cc9ae2e2c5478b':
  避免PortStart为-1时未正确设置PortRange参数
 2019-01-10 19:40:27 +08:00
邱剑 d25457892e Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '1a0165e567a95033814eef1ce861515cf69fd4f6':
  避免PortStart为-1时未正确设置PortRange参数
 2019-01-10 19:40:26 +08:00
邱剑 082b003451 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'd25457892e522e6eee2cb9fa8c0a5387e304a53c':
  避免PortStart为-1时未正确设置PortRange参数
 2019-01-10 19:40:26 +08:00
屈轩 e267a7064e 避免PortStart为-1时未正确设置PortRange参数 2019-01-10 17:54:13 +08:00
李泽玺 0c640fd179 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '40eb0119ceef64af5671c771bdb9b90cd66f4dfa':
  region: isolated_devices purge action
 2019-01-10 15:59:59 +08:00
Zexi Li 9eca0250ae region: isolated_devices purge action 2019-01-10 12:21:42 +08:00
wanyaoqi 3d2183a7c9 temp 2019-01-10 11:34:54 +08:00
Qiu Jian 06c9e6eb7e make fmt 2019-01-09 20:56:31 +08:00
Qiu Jian 01db84f737 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-vmware-sync-skip-failed-host 2019-01-09 20:54:48 +08:00
Qiu Jian 606802b582 修正：1. attach权限校验总是false 2. 增加climc user 
default_project_id相关方法
 2019-01-09 20:49:26 +08:00
邱剑 75a790e8e6 Merge pull request #912 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-list-extend to release/2.5.0 
* commit 'b9a788018460e811717552c19281a0a4e8533b4e':
  server-list add disks info and isolated_device info
 2019-01-09 18:47:26 +08:00
李泽玺 f7a4997540 Merge pull request #911 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-mcclient-module-delete-with-param-interface to release/2.5.0 
* commit '50b3603d9d534e333412c03bcf6fd005ab6eda42':
  mcclient module增加DeleteWithParam接口，允许把queryString传递到后端，修正前端无法清理回收站的问题
 2019-01-09 18:35:42 +08:00
wanyaoqi b9a7880184 server-list add disks info and isolated_device info 2019-01-09 18:33:54 +08:00
邱剑 61ea826f9a Merge pull request #909 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-vm-renew-not-effective to release/2.5.0 
* commit 'a14fad1b9cd1b7fcd3ede71ad35d2e120155fef1':
  修正：清理到期包年包月主机需要把删除保护去掉
  minor fixes
  修正对包年包月主机续费后没有效果的问题
 2019-01-09 18:31:54 +08:00
Qiu Jian a14fad1b9c 修正：清理到期包年包月主机需要把删除保护去掉 2019-01-09 18:26:42 +08:00
邱剑 b3f181df8f Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'd0bd046cbed8cb9bc1fd20ab2526c6ae924d37ff':
  避免因secret为空，导致插入数据库时报错: Field 'secret' doesn't have a default value
 2019-01-09 17:30:17 +08:00
邱剑 7f37ff8709 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'b3f181df8f4bb11dbf5416cf1271686289dcd920':
  避免因secret为空，导致插入数据库时报错: Field 'secret' doesn't have a default value
 2019-01-09 17:30:17 +08:00
邱剑 d15d835c58 Merge pull request #910 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-fix-unmarshal-nil to release/2.5.0 
* commit 'd3d7d395f3c1230a86c0e8eef3621ef243dfb08c':
  避免unmarshal nil
 2019-01-09 17:29:55 +08:00
Qiu Jian 50b3603d9d mcclient 
module增加DeleteWithParam接口，允许把queryString传递到后端，修正前端无法清理回收站的问题
 2019-01-09 17:25:16 +08:00
屈轩 d3d7d395f3 避免unmarshal nil 2019-01-09 17:19:31 +08:00
Qiu Jian d809566780 minor fixes 2019-01-09 16:44:58 +08:00
Qiu Jian 4fb3974367 修正对包年包月主机续费后没有效果的问题 2019-01-09 16:42:59 +08:00
屈轩 6285f13983 避免因secret为空，导致插入数据库时报错: Field 'secret' doesn't have a default value 2019-01-09 16:08:08 +08:00
Qiu Jian e3766653f6 修正：1. allowattach rbac compatible 2. server insert iso fail 2019-01-09 10:27:30 +08:00
Qiu Jian 3745065611 修正：1. vmware同步宿主机出错后应该尽力而为地同步所有能同步的机器 2. 
保存镜像时，如果缺少osType报错
 2019-01-09 00:24:33 +08:00
Zexi Li 47442d0fb5 scheduler: 修复 host cache desc 缺失 ZoneID 导致 prefer_zone 机制不生效 2019-01-08 23:48:27 +08:00
Zexi Li 5c0b04973a region: support server import 2019-01-08 21:32:57 +08:00
邱剑 397c7f1e69 Merge pull request #894 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fetch-by-global-unique-name to release/2.5.0 
* commit 'ceaa929cdd844d18c28da14c84592afdf1417648':
  在名称不冲突的情况下，允许非owner用户使用name访问资源
 2019-01-07 21:49:46 +08:00
邱剑 0dabca7839 Merge pull request #898 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/add-network-merge-split to release/2.4.0 
* commit '33120a005a777b719b28c87a38b342cb25d3b20b':
  add network merge split
 2019-01-07 21:49:32 +08:00
邱剑 a6e3d788cb Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '0dabca78396cdd8dc0339acc3f2049422e417d2f':
  add network merge split
 2019-01-07 21:49:32 +08:00
邱剑 cb2cc33866 Merge pull request #887 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-image-import-task-shoud-run-in-localtaskworker to release/2.5.0 
* commit 'ab2ee8d16d5a63a13aff861c8710043acb46cbc1':
  minor fixes
  修正：image import过程为耗时操作，需要在LocalTaskRun里执行，避免占用image的操作锁
 2019-01-07 21:48:02 +08:00
Qiu Jian 34352ae5db Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.5.0-20190107 
Conflicts:
	pkg/util/aliyun/aliyun.go
 2019-01-07 21:39:00 +08:00
邱剑 60da9abae0 Merge pull request #901 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-aliyun-delete-fail to release/2.4.0 
* commit '766039194898267d32322aca50213cc06daa82d6':
  return nil immediately if error is nil
  修正：1. server detach disk 缺少parentTaskId 2. aliyun 关机后立即 detachDisk 会出现InvalidOperation.Conflict的错误
 2019-01-07 20:57:51 +08:00
Zexi Li 2658734573 - fix service opt parse 
- raid drivers
 2019-01-07 19:54:33 +08:00
wanyaoqi 1ff21000d4 fix conflict 2019-01-07 17:14:09 +08:00
Zexi Li bad67fcbb6 utils pkg unify 2019-01-07 17:09:57 +08:00
Zexi Li fc69dd470b - baremetal server create 
- baremetal partition
- guest deploy fs
 2019-01-07 17:09:57 +08:00
Zexi Li 89031a152d baremetal diskconfig 2019-01-07 17:09:57 +08:00
wanyaoqi a60be05e34 add host register 2019-01-07 17:09:57 +08:00
wanyaoqi 86f13d3d77 guest sync config tasks, add monitor command 2019-01-07 17:09:57 +08:00
wanyaoqi 7fd6c0eec2 temp 2019-01-07 17:09:57 +08:00
wanyaoqi 74b486aca5 guest generate start stop script 2019-01-07 17:09:57 +08:00
wanyaoqi 011fbb13be diskhandler: local disk create, delete, resize 2019-01-07 17:09:57 +08:00