lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-06-23 09:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 24 Branches 641 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph

74 Commits

Author SHA1 Message Date
Qu Xuan
c6a474e036 fix: support azure policy 2020-04-11 15:43:06 +08:00
Qu Xuan
8723164a1d fix: 支持同步云平台配额信息 2020-03-30 10:24:05 +08:00
Qiu Jian
004d9b6f95 update copyright headers of all source 2019-03-29 14:47:48 +08:00
Qiu Jian
8ef19141a2 add more optimization 2019-03-29 00:42:23 +08:00
Qiu Jian
ca39f48058 fix: more accurate sync_status update time 2019-03-18 22:16:20 +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
66634a4dfa fix: eip support prepaid charge type 2019-02-23 18:45:04 +08:00
邱剑
0edeb53d28 update models with db.Update interface 2019-02-22 12:06:13 +08:00
邱剑
50d4e47869 Merge pull request #1079 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-recode-cloudprovider to release/2.6.0 
* commit 'c0c88174592d2d9d22f45e3d05beb577fc324a74':
  baremetal and host request IP from on premise network
  do not checkout storage limit for none-on-premise cloud
  fix host usable filter
  make fmt
  fix: list managed resources and associate resources with uniform filters
  Recode cloudprovider/cloudproviderfactory
 2019-02-20 22:00:26 +08:00
TangBin
cb1cf77c4e fix huawei sync region 2019-02-20 11:24:12 +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
屈轩
27ce557a57 openstack 同步flavor 2019-02-16 17:38:30 +08:00
Qiu Jian
066d155a16 fix: logger did not record start time of events 2019-02-16 13:47:18 +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
邱剑
c97fd82409 Merge pull request #973 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-aws-image-fetch-info to release/2.6.0 
* commit '878bc69358620916304e5c28d6b15d7c20d88756':
  minor updates
  改进：对Aws系统镜像分类处理
 2019-01-26 20:10:17 +08:00
屈轩
dc81eb1d5e 统一LoadBalancer函数大小写问题 2019-01-25 14:57:57 +08:00
Qiu Jian
96b81f40c1 改进：对Aws系统镜像分类处理 2019-01-25 12:34:07 +08:00
Qiu Jian
e92330a0ac minor fixes for vmware 2019-01-22 23:59:41 +08:00
Qiu Jian
beb2ac66b5 增加：1. 将公有云标准镜像同步到本地 2. 可以从公有云标准镜像创建主机 3. 
在公有云缓存镜像时遵守公有云镜像的配额
 2019-01-21 09:21:02 +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
Qiu Jian
df41b7cdcd use separate worker for long running tasks, such as ImageConvertTask, 
ImageCheckTask, CloudProviderSyncInfoTask
 2018-12-27 16:19:24 +08:00
邱剑
0e447d34bd Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'e224af5ed5569d9dcd73e7be4912b71a8dfef745':
  fix
  修复初次同步云账号内存为空的问题
 2018-12-26 22:05:15 +08:00
TangBin
dc8086ed90 修复初次同步云账号内存为空的问题 2018-12-26 14:42:23 +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
邱剑
70c5b359d2 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '41be263c39d91743a703f07dac295f0695074036':
  同步完成后清理调度缓存
 2018-12-17 12:26:45 +08:00
邱剑
41be263c39 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '0a0e8414f3ed239267bb30b88163d4b30b8004a6':
  同步完成后清理调度缓存
 2018-12-17 12:26:45 +08:00
屈轩
e95e1ac081 冲突解决 2018-12-17 12:16:35 +08:00
邱剑
b797c4a2dc Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7bab92d0114a5152e5f5488bb2a84c1a0d404f2a':
  同步完成后清理调度缓存
 2018-12-17 12:13:35 +08:00
屈轩
b50cd5f667 同步完成后清理调度缓存 2018-12-17 12:02:57 +08:00
屈轩
616ce78302 LB 返回参数更新 2018-12-15 14:28:02 +08:00
屈轩
fcdf62a4d6 支持同步公有云负载均衡信息同步 2018-12-15 13:58:18 +08:00
Qiu Jian
e18302866b 1. GetShortDesc()改为GetShortDesc(ctx context.Context) 
2.
VirtualResource的GetShortDesc()中增加owner_tenant_id和owner_tenant两个字段
 2018-12-13 23:55:51 +08:00
Qiu Jian
341e4204a0 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-esxi-support-complete 2018-11-26 21:54:06 +08:00
屈轩
bf06bcdc8a 解决冲突 2018-11-26 16:52:02 +08:00
屈轩
18eedcf82c 解决冲突 2018-11-26 16:42:11 +08:00
屈轩
e98957b337 解决冲突 2018-11-26 16:27:32 +08:00
邱剑
411195176d Merge pull request #555 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-secgroup-sync to release/2.2.0 
* commit '5dc063ee40b60dbbce48cc036053e2171dace8e1':
  初始化model
 2018-11-26 13:47:04 +08:00
屈轩
5dc063ee40 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-secgroup-sync 2018-11-26 11:10:43 +08:00
Qiu Jian
dcbc3daf49 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-esxi-support-complete 2018-11-25 08:27:09 +08:00
Qiu Jian
94c49ded2e esxi support 2018-11-25 08:21:24 +08:00
Yousong Zhou
593219e010 aliyun: 同步routetables 2018-11-23 03:17:41 +00:00
邱剑
6b2d42d7b9 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '5f79b66ced502b82c999a0437e3fa1db3f196f59':
  改为补一条START日志
  Change workermanager backlog to 1024
  remove old log
  修正：在同步完vm的网络和磁盘信息后，再记录同步的日志
 2018-11-23 02:05:09 +08:00
Qiu Jian
90818b8112 改为补一条START日志 2018-11-23 02:02:52 +08:00