opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-04 23:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
287 Commits
Author SHA1 Message Date
Qiu Jian 8eb4a74c8b Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 
Conflicts:
	pkg/compute/guestdrivers/base.go
 2019-03-06 01:39:17 +08:00
Qiu Jian cb23c9c1a1 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 2019-03-06 00:11:44 +08:00
邱剑 c81051124d Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '65188bd7c267f3c76aa84003148ebd7b959dd564':
  忽略deny规则
  避免创建vpc后wire同步异常
  openstack重置密码不需要重启机器
  修复套餐系统盘盘大小异常问题
 2019-03-05 23:14:45 +08:00
屈轩 10f66f0bd0 修复套餐系统盘盘大小异常问题 2019-03-05 14:10:02 +08:00
屈轩 d6bec23039 使用公有云镜像时，正确设置登录用户名 2019-03-05 13:46:15 +08:00
邱剑 fb5adf56c0 Merge pull request #1156 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-external-project to release/2.7.0 
* commit '0ce6b70998e5646b7f1a1f0f610b003132fab980':
  更改ProjectSource -> ProjectSrc
  同步openstack项目
  同步azure项目
  腾讯云加入debug信息
  external_project去掉cloudregion属性
  补充其他资源项目同步
  映射表默认指向provider的project
  init
 2019-03-05 12:12:54 +08:00
TangBin 12c1bfb1d6 create instance tips fix && min_ram fix 2019-03-04 18:00:04 +08:00
屈轩 594b542aad external_project去掉cloudregion属性 2019-03-04 16:36:48 +08:00
屈轩 8bd0bc0024 补充其他资源项目同步 2019-03-04 16:36:47 +08:00
屈轩 173034cd26 映射表默认指向provider的project 2019-03-04 16:36:47 +08:00
屈轩 10d4ca66c0 init 2019-03-04 16:36:47 +08:00
Qiu Jian 605cbb2558 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 2019-03-04 01:42:39 +08:00
Qiu Jian 62ebc90f2a feature: allow auto sychrnoization of cloud account 2019-03-04 01:09:34 +08:00
Qiu Jian 92bfe69de1 fix: unify image.min_disk unit to MB 2019-02-25 17:04:51 +08:00
Qiu Jian 66634a4dfa fix: eip support prepaid charge type 2019-02-23 18:45:04 +08:00
Qiu Jian 9b65a9ecc3 make fmt 2019-02-19 16:53:16 +08:00
Qiu Jian 6bb72482b9 fix: list managed resources and associate resources with uniform filters 2019-02-19 16:45:09 +08:00
Qiu Jian 78dac22cda Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloudprovider 2019-02-18 23:21:56 +08:00
Qiu Jian d32633dc95 Recode cloudprovider/cloudproviderfactory 2019-02-18 23:10:57 +08:00
邱剑 e9e2dbaea1 Merge pull request #1024 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-oepnstack-stage2 to release/2.6.0 
* commit 'f5f2addfd7ea634e598293a37879c251b9eea006':
  避免部署主机失败后未设置external_id而删除主机失败
  rebase 2.6.0
  快照磁盘支持区分公有云私有云
  openstack 同步flavor
  openstack创建
 2019-02-18 23:02:49 +08:00
邱剑 23d883ceae Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '274e31d858fb054a0ccda96a65f292df94727740':
  通过provider is_public_cloud区分公有云私有云
 2019-02-18 18:29:46 +08:00
屈轩 2ffe44a383 通过provider is_public_cloud区分公有云私有云 2019-02-18 17:43:31 +08:00
屈轩 27ce557a57 openstack 同步flavor 2019-02-16 17:38:30 +08:00
屈轩 d85e2f8162 openstack创建 2019-02-16 17:37:33 +08:00
Qiu Jian 0ad4c22879 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190213 
Conflicts:
	pkg/compute/tasks/cloud_provider_sync_info_task.go
 2019-02-13 12:12:19 +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
周有松 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
屈轩 409b376ebd 修正udp,tcp后端服务器组id异常 2019-01-25 15:00:45 +08:00
屈轩 53b03c1d59 添加监听同步配置操作 2019-01-25 15:00:05 +08:00
屈轩 dc81eb1d5e 统一LoadBalancer函数大小写问题 2019-01-25 14:57:57 +08:00
屈轩 2df78f917f 添加region driver 2019-01-25 14:54:27 +08:00
屈轩 0a9db10e83 优化创建虚机结构 2019-01-24 21:48:13 +08:00
屈轩 bf89aa274f 优化虚机创建方法 2019-01-24 15:05:02 +08:00
TangBin d0bb6a894d merge release/2.6.0 2019-01-23 11:14:39 +08:00
Qiu Jian 4e3d9a7cf0 fixes for qcloud&azure 2019-01-22 22:53:43 +08:00
Qiu Jian beb2ac66b5 增加：1. 将公有云标准镜像同步到本地 2. 可以从公有云标准镜像创建主机 3. 
在公有云缓存镜像时遵守公有云镜像的配额
 2019-01-21 09:21:02 +08:00
唐斌 919f164f95 huawei support stage 2 2019-01-19 17:58:00 +08:00
屈轩 8f65712632 climc 更新 2019-01-18 10:57:36 +08:00
屈轩 b68bbef09d 后端对公有云账号密码信息重组 2019-01-17 16:23:00 +08:00
Qiu Jian f3b85dcb7b 修正：storage增加IsSysDiskStore属性，标示是否支持系统盘创建。阿里云cloud存储不支持系统盘创建 2019-01-15 22:42:55 +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 7660391948 return nil immediately if error is nil 2019-01-07 11:50:42 +08:00
Qiu Jian eef83be10c 修正：1. server detach disk 缺少parentTaskId 2. aliyun 关机后立即 
detachDisk 会出现InvalidOperation.Conflict的错误
 2019-01-06 20:54:49 +08:00
tangbin 764eb09481 merge release/2.5.0 2019-01-01 17:00:23 +08:00
TangBin 3b91a27fc9 huawei cloud sync 2019-01-01 16:21:37 +08:00
邱剑 83a529f234 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f10b31c0bdee8e6d1f2d4cfa5457d83cc0256f82':
  client session add context
 2018-12-25 15:25:52 +08:00
wanyaoqi 742a67b0f8 client session add context 2018-12-25 13:33:33 +08:00
邱剑 a30b41bebe Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'd4f11ae6dfc8a9d1c53b6f1d98aad05cef9e91cd':
  腾讯云支持余额查询
  cloudaccount增加更多统计信息
  添加cloudaccount项目信息
 2018-12-21 11:08:18 +08:00
Qiu Jian 0566b17f99 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181220 
Conflicts:
	pkg/compute/models/cloudaccounts.go
 2018-12-21 00:44:42 +08:00