opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-22 06:40:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,773 Commits 27 Branches 687 Tags
ecc653f0a1de013d34da660e9494f51649fda0cc
Commit Graph
742 Commits
Author SHA1 Message Date
Qiu Jian 72d8dd8961 fix: esxi references2Objects refer nil objects 2019-02-20 23:13:27 +08:00
邱剑 fb4592a4fa Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '6ec91d6f4dd6ebf539369987fd829738bb6c0cbf':
  识别新版vmdk
 2019-02-19 17:34:30 +08:00
屈轩 323836b1f8 识别新版vmdk 2019-02-19 17:25:55 +08:00
屈轩 2ffe44a383 通过provider is_public_cloud区分公有云私有云 2019-02-18 17:43:31 +08:00
Qiu Jian 6fccbfcd6e Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.5.0-20190213 
Conflicts:
	pkg/compute/models/guests.go
	pkg/compute/service/service.go
	pkg/compute/tasks/cloud_provider_sync_info_task.go
 2019-02-13 12:01:01 +08:00
Qiu Jian 173526ce06 fix: correct VM expiration date before clean expired prepaid VM 2019-02-12 01:02:57 +08:00
屈轩 2f23eae351 缓存lb endpoint 2019-02-11 14:18:05 +08:00
屈轩 14bc2270f5 请求aliyun负载均衡使用对应的endpoint 2019-02-11 12:01:53 +08:00
Qiu Jian e8445c0d45 修正：httperror没有正确parse错误格式 2019-01-27 18:50:29 +08:00
屈轩 881ed73ce5 修复opentack同步的问题 2019-01-26 16:45:37 +08:00
周有松 700d9229c7 Merge pull request #962 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-lb-sync to release/2.5.0 
* commit 'f6481b73633741cead155b97d2e01c7ee3b2221c':
  修复lb同步时的一些小问题
 2019-01-25 12:42:55 +08:00
屈轩 f6481b7363 修复lb同步时的一些小问题 2019-01-24 12:24:51 +08:00
Qiu Jian a035a0efb3 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-fix-aliyun-network-fail-to-delete 2019-01-23 14:24:05 +08:00
唐斌 e38e2f9f86 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'b63e32a8d467a9faa4fae7763c7787831752fd14':
  update aws secrule sync
 2019-01-23 11:45:29 +08:00
Qiu Jian 6ae353ea2d Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-fix-aliyun-network-fail-to-delete 2019-01-23 00:09:22 +08:00
邱剑 5a11f0ccb4 Merge pull request #954 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-httputils to release/2.5.0 
* commit 'fd9446a866943e7a7346fa548628eec11ca0216d':
  统一返回resp error
 2019-01-22 23:06:16 +08:00
屈轩 b863ea6d32 补充同步lb network 2019-01-22 16:51:16 +08:00
屈轩 fd9446a866 统一返回resp error 2019-01-22 13:44:49 +08:00
Qiu Jian c5343a111b 修正：由于阿里云网络与SNAT关联，导致无法删除 2019-01-22 02:46:35 +08:00
TangBin c3c86c36e5 update aws secrule sync 2019-01-21 20:27:52 +08:00
邱剑 bbcea5e8dc Merge pull request #946 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-account to release/2.5.0 
* commit 'b16bc5d2cb39d912696f8503dfa3cc638e42fb8d':
  修复openstack项目及用户名顺序颠倒问题
 2019-01-19 13:21:19 +08:00
屈轩 b16bc5d2cb 修复openstack项目及用户名顺序颠倒问题 2019-01-19 13:18:47 +08:00
屈轩 a1a0445779 避免传递tenant_id和onecloud api冲突 2019-01-19 12:20:45 +08:00
屈轩 8f65712632 climc 更新 2019-01-18 10:57:36 +08:00
屈轩 b68bbef09d 后端对公有云账号密码信息重组 2019-01-17 16:23:00 +08:00
Qiu Jian 069394b2ad 修正：esxi host名称不使用full domain name 2019-01-16 20:15:43 +08:00
Qiu Jian f3b85dcb7b 修正：storage增加IsSysDiskStore属性，标示是否支持系统盘创建。阿里云cloud存储不支持系统盘创建 2019-01-15 22:42:55 +08:00
TangBin affd9bde8b fix huawei client package name error 2019-01-14 14:20:15 +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
邱剑 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
邱剑 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
屈轩 e267a7064e 避免PortStart为-1时未正确设置PortRange参数 2019-01-10 17:54:13 +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
Qiu Jian eef83be10c 修正：1. server detach disk 缺少parentTaskId 2. aliyun 关机后立即 
detachDisk 会出现InvalidOperation.Conflict的错误
 2019-01-06 20:54:49 +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
邱剑 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
屈轩 630d2518b1 修复腾讯云无限删除预付费实例失败问题 2019-01-05 11:31:09 +08:00
Qiu Jian c477a05f39 增加：1. 
包年包月主机加入资源池后，如果auto_delete=true，则自动删除该主机 2.
包年包月资源池的宿主机支持续费操作Perform(host.id,
"renew-prepaid-recycle", {"duration": "1m"})
 2019-01-05 09:51:58 +08:00
Qiu Jian e5aa26f0af 修正：1. storagecache.CacheImage接口需要指定format 2. 
PerformAction默认返回ActionNotFound Error
 2019-01-04 17:36:54 +08:00
Qiu Jian 71f47e7d32 minor fixes 2019-01-03 23:33:05 +08:00
邱剑 e15faea047 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'd4b544af762fcb64510cf578b318c2dc006328df':
  修复同步腾讯云storage type数据不准问题
 2019-01-03 16:23:40 +08:00
邱剑 d4b544af76 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '13a26a2316bd0d926984a3c0d9331a784113a618':
  修复同步腾讯云storage type数据不准问题
 2019-01-03 16:23:40 +08:00
屈轩 060ae5718b 修复同步腾讯云storage type数据不准问题 2019-01-03 16:19:41 +08:00
TangBin ca5d98ebe8 修复华为云安全组同步及子账户多了一个无效记录的问题 2019-01-03 11:12:12 +08:00
Rex Zhang 1d9f0a7954 hotfix; gofmt 2019-01-02 18:36:11 +08:00
屈轩 adb95b27df 更新vendor 2019-01-02 17:38:59 +08:00
屈轩 935cd5dcac 优先使用hypervisor接口 2019-01-02 17:38:59 +08:00
屈轩 54e3e2fba2 获取openstack compute api version 2019-01-02 17:37:51 +08:00