lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-05-31 04:50:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,996 Commits 36 Branches 638 Tags
7b30e84ae87a92ecd5c8f211bf454cd3461dec29
Commit Graph

80 Commits

Author SHA1 Message Date
邱剑
7b30e84ae8 Merge pull request #1235 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-create-error to release/2.7.0 
* commit '13f36146fa7656422d3edbe5c66911a30a3987d6':
  避免openstack创建机器失败后长时间等待
 2019-03-13 21:37:32 +08:00
Yousong Zhou
4c82dae39b Merge remote-tracking branch 'origin/release/2.6.0' into bugfix/yousong-goimports-270 2019-03-13 13:33:51 +00:00
屈轩
13f36146fa 避免openstack创建机器失败后长时间等待 2019-03-13 21:32:26 +08:00
Yousong Zhou
8fe4f2ec98 treewide: group imports with goimports 
./goimports -w -local yunion.io/x/onecloud/ -corp yunion.io/x/ $GOPATH/src/yunion.io/x/onecloud/{cmd,pkg}
 2019-03-13 10:46:12 +00:00
Qiu Jian
300f4e5163 fix: recode cloud-account-create commands, easier to use 2019-03-13 01:42:07 +08:00
邱剑
56c606f9c1 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '6ec6b2cf6c7db754713629f5d163ca4fd4b58dcd':
  尽可能的同步openstack host信息
 2019-03-11 18:09:30 +08:00
屈轩
c5d7189b1b 冲突解决 2019-03-11 17:56:55 +08:00
邱剑
da39961b19 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'c80ebefaca1e5c7a6018465e99e6f5b8abfd0cd9':
  openstack: 不创建flavor,仅查找合适的套餐
  避免创建flavor时重名
 2019-03-11 17:24:13 +08:00
邱剑
c80ebefaca Merge pull request #1194 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-flavor to release/2.6.0 
* commit 'cc6aff8743e5d0bfc7223e3c9c25b04bcb2f4917':
  openstack: 不创建flavor,仅查找合适的套餐
  避免创建flavor时重名
 2019-03-11 17:24:12 +08:00
邱剑
50550c42e0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '4a655258cac12d3d6ff2b377dfc06379b16a4640':
  openstack忽略已存在的安全组规则创建错误
  修复k版openstack不支持id=in:参数
 2019-03-11 17:20:46 +08:00
屈轩
cc6aff8743 openstack: 不创建flavor,仅查找合适的套餐 2019-03-11 10:43:57 +08:00
屈轩
42589ad68f 尽可能的同步openstack host信息 2019-03-09 14:37:07 +08:00
屈轩
12b8a66358 openstack忽略已存在的安全组规则创建错误 2019-03-09 14:17:19 +08:00
屈轩
dd286d6b7e 修复k版openstack不支持id=in:参数 2019-03-09 13:26:06 +08:00
屈轩
bddf33140a 避免创建flavor时重名 2019-03-08 12:39:47 +08:00
Qiu Jian
52ab56fa3f Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 
Conflicts:
	pkg/compute/guestdrivers/aws.go
 2019-03-07 15:22:58 +08:00
周有松
09fe040285 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '921038826d35fc655bc1dac048d9630c29468af3':
  避免deploy任务结束时检查系统盘id与返回的磁盘id不匹配导致任务失败
 2019-03-07 14:47:14 +08:00
屈轩
9185c3c2ac 避免deploy任务结束时检查系统盘id与返回的磁盘id不匹配导致任务失败 2019-03-07 14:44:59 +08:00
邱剑
09837a31a0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'd8ffe73d588b61f1011d3b3356127d0464c272b2':
  创建openstack磁盘使用默认的zone
 2019-03-06 23:47:30 +08:00
屈轩
2a039a782d 创建openstack磁盘使用默认的zone 2019-03-06 21:16:26 +08:00
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
屈轩
53137dec29 忽略deny规则 2019-03-05 17:25:25 +08:00
屈轩
ef4e13c668 避免创建vpc后wire同步异常 2019-03-05 16:34:44 +08:00
屈轩
10f66f0bd0 修复套餐系统盘盘大小异常问题 2019-03-05 14:10:02 +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
屈轩
ba61e5d8f4 同步openstack项目 2019-03-04 18:29:06 +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
屈轩
7544a3daf1 创建openstack指定对应的主机 2019-03-03 15:02:17 +08:00
屈轩
fa008f4e58 解决冲突 2019-03-03 14:54:48 +08:00
屈轩
dc799abbc9 更改命名方式 2019-03-01 17:45:22 +08:00
屈轩
6063545a07 虚拟zone 2019-03-01 16:41:11 +08:00
屈轩
41404e19b1 获取所有项目 2019-03-01 15:53:55 +08:00
屈轩
7475aa0fb1 避免同步相同的host 2019-03-01 11:40:01 +08:00
屈轩
3ab8beee03 过滤zone底下的host 2019-03-01 11:35:10 +08:00
屈轩
fcfbf69ab2 解决冲突 2019-02-28 20:16:34 +08:00
屈轩
1c8eeb317a 限制endpoint范围 2019-02-28 15:50:55 +08:00
屈轩
e6bfe279a1 支持openstack选择对应的endpoint类型 2019-02-28 15:23:41 +08:00
Qiu Jian
92bfe69de1 fix: unify image.min_disk unit to MB 2019-02-25 17:04:51 +08:00
Qiu Jian
e4d1a7a21f fix: build broken for changing GetNetworkOfIP to GetOnPremiseNetworkOfIP 2019-02-21 11:02:37 +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