opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 23:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,510 Commits 30 Branches 714 Tags
606802b5825bb61db5efccfff46ef3efe3f0fc12
Commit Graph
3510 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Qiu Jian 606802b582 修正：1. attach权限校验总是false 2. 增加climc user 
default_project_id相关方法
 2019-01-09 20:49:26 +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
邱剑 f74f91289c Merge pull request #907 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-scheduler-host-zoneid-missing to release/2.5.0 
* commit '47442d0fb587f44fcada042938d9211eec0183e0':
  scheduler: 修复 host cache desc 缺失 ZoneID 导致 prefer_zone 机制不生效
 2019-01-08 23:42:55 +08:00
Zexi Li 47442d0fb5 scheduler: 修复 host cache desc 缺失 ZoneID 导致 prefer_zone 机制不生效 2019-01-08 23:48:27 +08:00
李泽玺 7a4199dade Merge pull request #906 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-server-import to release/2.5.0 
* commit '5c0b04973ad5865a0b778ed5cbc5bc9595c4b0d5':
  region: support server import
 2019-01-08 22:11:30 +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
邱剑 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
邱剑 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
邱剑 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
邱剑 714a073a82 Merge pull request #905 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-2.5.0-20190107 to release/2.5.0 
* commit '34352ae5db6a63447302c2169a9eb77045ce69fe':
  return nil immediately if error is nil
  修正：1. server detach disk 缺少parentTaskId 2. aliyun 关机后立即 detachDisk 会出现InvalidOperation.Conflict的错误
 2019-01-07 21:41:03 +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
邱剑 a9cf799495 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '7f5fd08aaeff161682ba1c116d989fa953dfd6b3':
  修正：host启用netif时应该优先使用server_type为baremetal的network
 2019-01-07 16:27:31 +08:00
邱剑 7f5fd08aae Merge pull request #902 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-enable-netif-use-guest-network to release/2.4.0 
* commit '14b9b2314c88ad743c02cc67b2d26f255bf44eb4':
  修正：host启用netif时应该优先使用server_type为baremetal的network
 2019-01-07 16:27:30 +08:00
李泽玺 d1b34bd6da Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '598b6c83f7f7b24faa8a58f68bd0f2f85721c96c':
  修正：capability接口返回的hypervisor列表中忽略了baremetal
 2019-01-07 12:13:20 +08:00
李泽玺 598b6c83f7 Merge pull request #899 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-capability-hypervisor-ignore-baremetals to release/2.4.0 
* commit 'd2f2beb4c82041080edb3bb405927b11ed3400d3':
  修正：capability接口返回的hypervisor列表中忽略了baremetal
 2019-01-07 12:13:19 +08:00
Qiu Jian 7660391948 return nil immediately if error is nil 2019-01-07 11:50:42 +08:00
Qiu Jian 14b9b2314c 修正：host启用netif时应该优先使用server_type为baremetal的network 2019-01-07 01:59:54 +08:00
Qiu Jian eef83be10c 修正：1. server detach disk 缺少parentTaskId 2. aliyun 关机后立即 
detachDisk 会出现InvalidOperation.Conflict的错误
 2019-01-06 20:54:49 +08:00
邱剑 545686a4fe Merge pull request #900 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-driver to release/2.5.0 
* commit '418c4620a13dad728427d06628a4e4e066243c55':
  补充openstack driver
 2019-01-06 17:44:55 +08:00
屈轩 418c4620a1 补充openstack driver 2019-01-06 14:11:37 +08:00
wanyaoqi 33120a005a add network merge split 2019-01-05 22:37:21 +08:00
Qiu Jian d2f2beb4c8 修正：capability接口返回的hypervisor列表中忽略了baremetal 2019-01-05 20:18:00 +08:00
邱剑 6db7d1c91e Merge pull request #897 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-detach-disk-status to release/2.4.0 
* commit '8fe57af4a2831f55bca5dc97d0a9e02ab6fceb2e':
  卸载磁盘时状态为init的,默认进行删除操作,并直接设置磁盘状态未卸载中
 2019-01-05 20:15:18 +08:00
邱剑 83ca2c0802 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '6db7d1c91e9dffdd373af5d87581471406bcdcbb':
  卸载磁盘时状态为init的,默认进行删除操作,并直接设置磁盘状态未卸载中
 2019-01-05 20:15:18 +08:00
邱剑 143083d2cf Merge pull request #883 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-storage-cache-image-missing-format to release/2.5.0 
* commit 'e5aa26f0afbfadc847e4399a19ae798eafac0d57':
  修正：1. storagecache.CacheImage接口需要指定format 2. PerformAction默认返回ActionNotFound Error
 2019-01-05 20:14:39 +08:00
邱剑 54b1df6ed3 Merge pull request #886 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-vipkid-prepaid-features to release/2.5.0 
* commit 'ffe6d3910d8dccbab848fb1c08f81a8c0521ee65':
  增加climc zone-update-status命令
  server-create创建prepaid主机，增加auto_prepaid_recycle参数，创建后自动加入包年包月资源池
  minor fixes
  minor changes: 防止float类型的column设置default后每次都要更新
  增加：1. 包年包月主机加入资源池后，如果auto_delete=true，则自动删除该主机 2. 包年包月资源池的宿主机支持续费操作Perform(host.id, "renew-prepaid-recycle", {"duration": "1m"})
 2019-01-05 20:14:17 +08:00
邱剑 3bba07cbf5 Merge pull request #895 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-sched-filter-zone-status to release/2.5.0 
* commit 'c0102d0a32bfe2c0307c3cf4d71e0aa9eadfbe66':
  scheduler: host 的 zone status 为 enable 时才能调度
 2019-01-05 20:14:09 +08:00
Qiu Jian ab2ee8d16d minor fixes 2019-01-05 19:37:00 +08:00
邱剑 996fdef43d Merge pull request #896 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-delete-image to release/2.5.0 
* commit 'de2f6c219f1a7c5f4879200fb8bbbb4cc39652ee':
  避免删除非正常状态下image再次恢复时,镜像使用时会出现非预期状态
 2019-01-05 19:16:39 +08:00
屈轩 8fe57af4a2 卸载磁盘时状态为init的,默认进行删除操作,并直接设置磁盘状态未卸载中 2019-01-05 19:13:41 +08:00
屈轩 de2f6c219f 避免删除非正常状态下image再次恢复时,镜像使用时会出现非预期状态 2019-01-05 18:26:16 +08:00
Qiu Jian ffe6d3910d 增加climc zone-update-status命令 2019-01-05 18:04:40 +08:00
Zexi Li c0102d0a32 scheduler: host 的 zone status 为 enable 时才能调度 2019-01-05 17:50:53 +08:00
Qiu Jian ceaa929cdd 在名称不冲突的情况下，允许非owner用户使用name访问资源 2019-01-05 17:47:30 +08:00
邱剑 0dcf76c852 Merge pull request #890 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-detach-disk to release/2.4.0 
* commit 'ba4493ceea88a4d0317f58bf9b167765fa429ff6':
  避免未找到磁盘时未及时返回错误信息
 2019-01-05 17:38:05 +08:00
邱剑 8a2f0cb650 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '0dcf76c852d1f1b0bfe989ba281f3968a83b20b5':
  避免未找到磁盘时未及时返回错误信息
 2019-01-05 17:38:05 +08:00
邱剑 2e3164edec Merge pull request #893 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-conflict-2.4.0 to release/2.4.0 
* commit '8f54b36d3c77d90a3fb7161d47ec77512c879c35':
  磁盘详情显示虚机id
 2019-01-05 17:37:45 +08:00
邱剑 a3af439e9e Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '2e3164edecb959287f3e2ac5eb6d6beca53e5d74':
  磁盘详情显示虚机id
 2019-01-05 17:37:45 +08:00
屈轩 8f54b36d3c 冲突解决 2019-01-05 17:31:25 +08:00
Qiu Jian 6744fb8a4a server-create创建prepaid主机，增加auto_prepaid_recycle参数，创建后自动加入包年包月资源池 2019-01-05 17:28:34 +08:00
邱剑 8476610202 Merge pull request #889 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-delete-vm to release/2.4.0 
* commit '630d2518b171eab4b7432c07a9e2dfb01d4277b2':
  修复腾讯云无限删除预付费实例失败问题
 2019-01-05 17:09:57 +08:00
邱剑 41748899e1 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '8476610202a72fa4d06cc5a6cffe8fb10ac2cbc2':
  修复腾讯云无限删除预付费实例失败问题
 2019-01-05 17:09:57 +08:00
邱剑 4d15828bb5 Merge pull request #891 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-detail to release/2.3.0 
* commit 'e141a97b150706e21e0fd6ff6348972d719aa01e':
  磁盘详情显示虚机id
 2019-01-05 17:08:44 +08:00
Qiu Jian b8b7146e06 Merge branch 'feature/qj-vipkid-prepaid-features' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vipkid-prepaid-features 2019-01-05 16:22:25 +08:00
Qiu Jian 051f5fcb6b minor fixes 2019-01-05 16:22:09 +08:00
屈轩 e141a97b15 磁盘详情显示虚机id 2019-01-05 15:46:23 +08:00
Qiu Jian 56f770b691 minor changes: 防止float类型的column设置default后每次都要更新 2019-01-05 14:28:23 +08:00