opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,070 Commits 30 Branches 714 Tags
fcd4fd62e2a68f6945728dff50db9787055df419
Commit Graph
1029 Commits
Author SHA1 Message Date
邱剑 a4083c663f Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '4d931b20357e8e621645c461388de6a92a477902':
  make fmt
  fix: recode cloud-account-create commands, easier to use
 2019-03-13 20:14:49 +08:00
邱剑 b9a5b2a431 Merge pull request #1221 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.8.0 
* commit '1d87a1ffc5ed7533e0745e32073e2e06a0378334':
  fix code, fix bug resize disk
  fix deploy with iso error
  support nfs storage
 2019-03-13 10:33:20 +08:00
Qiu Jian 300f4e5163 fix: recode cloud-account-create commands, easier to use 2019-03-13 01:42:07 +08:00
wanyaoqi 95da368f36 support nfs storage 2019-03-12 12:46:55 +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
邱剑 6ec6b2cf6c Merge pull request #1214 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-conflict-k to release/2.6.0 
* commit 'c5d7189b1b7e6ecf9a3ed85191f65b1e731dc94c':
  尽可能的同步openstack host信息
 2019-03-11 18:09:30 +08:00
邱剑 11cf531be3 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '041d79c95980cff522588b332080a22793b77f11':
  huawei renew bugfix
  add auto renew consts
  add huawei renew isntance
 2019-03-11 18:09:08 +08:00
邱剑 041d79c959 Merge pull request #1196 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-prepaid-guest-renew to release/2.6.0 
* commit '12cd111af41b15a67cb471234d1df19310126468':
  huawei renew bugfix
  add auto renew consts
  add huawei renew isntance
 2019-03-11 18:09:08 +08:00
屈轩 c5d7189b1b 冲突解决 2019-03-11 17:56:55 +08:00
TangBin 12cd111af4 huawei renew bugfix 2019-03-11 17:54:28 +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
邱剑 4a655258ca Merge pull request #1203 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-image-kilo to release/2.6.0 
* commit '12b8a66358a9f53cb565da165111f299ab53c665':
  openstack忽略已存在的安全组规则创建错误
  修复k版openstack不支持id=in:参数
 2019-03-11 17:20:45 +08:00
Qiu Jian 8815193f33 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190311 
Conflicts:
	pkg/compute/guestdrivers/aws.go
	pkg/compute/guestdrivers/huawei.go
	pkg/compute/guestdrivers/openstack.go
	pkg/compute/models/guests.go
	pkg/compute/models/hosts.go
 2019-03-11 15:03:25 +08:00
Qiu Jian 2552c658c4 fix: recode host.getWiresOfId 2019-03-11 14:32:36 +08:00
屈轩 cc6aff8743 openstack: 不创建flavor,仅查找合适的套餐 2019-03-11 10:43:57 +08:00
TangBin 7d74947202 add auto renew consts 2019-03-11 10:13:13 +08:00
Qiu Jian 7bdab6e02d feature: nic bonding/teaming support on region 2019-03-11 04:45:34 +08:00
屈轩 42589ad68f 尽可能的同步openstack host信息 2019-03-09 14:37:07 +08:00
屈轩 12b8a66358 openstack忽略已存在的安全组规则创建错误 2019-03-09 14:17:19 +08:00
Zexi Li c94ec06dc2 Merge remote-tracking branch 'origin/release/2.6.0' into confict/lzx-resolv-20190309 2019-03-09 14:02:36 +08:00
屈轩 dd286d6b7e 修复k版openstack不支持id=in:参数 2019-03-09 13:26:06 +08:00
TangBin 9f81a2b8dc add huawei renew isntance 2019-03-08 18:07:24 +08:00
屈轩 bddf33140a 避免创建flavor时重名 2019-03-08 12:39:47 +08:00
邱剑 ba5606dd30 Merge pull request #1189 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-msyd-20190307 to release/2.6.0 
* commit '76bab2c693c6fc6f8dd4939a1469a4914edc10d4':
  fix: 1. skip using temporary binding mac at host startup 2. active baremetal NIC index always reset to 0
  fix: allow host attach to same wire with multiple interface
  fix: huawei filter excludes skus with null providers
  fix: exi host name conversion remove ip
 2019-03-08 10:27:28 +08:00
周有松 a97e2faea8 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '84d91f281103767b964a6b09aeba85c854a59c5e':
  修正一些错误信息描述
 2019-03-07 16:57:59 +08:00
周有松 84d91f2811 Merge pull request #1185 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-error-return to release/2.6.0 
* commit '58ee33c3f09792838d79420703fc560db07c6258':
  修正一些错误信息描述
 2019-03-07 16:57:58 +08:00
屈轩 58ee33c3f0 修正一些错误信息描述 2019-03-07 16:48:15 +08:00
邱剑 959bc3ec20 Merge pull request #1148 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-sync-with-lock to release/2.7.0 
* commit '52ab56fa3f338caaed7a7a9ff3bc45a8f2f661eb':
  conditional compilation: compile rbd on linux only
  update vendor
  improvements: autonomously adjust sync interval according to resources in region
  skip objects that is undergoing a task
  fix: resolve import loop between skus and models, merge skus into models
  feature: allow auto sychrnoization of cloud account
 2019-03-07 16:08:00 +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
周有松 122d49d3a8 Merge pull request #1181 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-import-image-bugfix to release/2.6.0 
* commit '5bcf5942933e759ba888fdee3046e8ebf3bb0368':
  build error fix
 2019-03-07 15:18:03 +08:00
周有松 6bd1afa917 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '122d49d3a822239c019f30fda0873c0bd4f123cb':
  build error fix
 2019-03-07 15:18:03 +08:00
TangBin 5bcf594293 build error fix 2019-03-07 15:16:37 +08:00
周有松 921038826d Merge pull request #1178 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-rebuild-root to release/2.6.0 
* commit '9185c3c2acf055da048f525b10bd754c1affec3d':
  避免deploy任务结束时检查系统盘id与返回的磁盘id不匹配导致任务失败
 2019-03-07 14:47:14 +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
周有松 327145d173 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '2ae7c3e5c35a2181020baaa308f06cbc703090db':
  disk GB fix && make fmt
 2019-03-07 14:41:48 +08:00
周有松 f84b75977e Merge pull request #1177 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-conflicts-fix-2.7.0 to release/2.7.0 
* commit '8009f714d4a39c5fbbabc5a059b103479856b851':
  过滤掉不支持的huawei skus & image
  imagetools add RHEL dist
  统一aws登录用户名
  统一aliyun登录用户名
  使用公有云镜像时，正确设置登录用户名
 2019-03-07 14:41:33 +08:00
TangBin e6f4186236 disk GB fix && make fmt 2019-03-07 14:28:21 +08:00
Qiu Jian 3d1ba16f95 fix: exi host name conversion remove ip 2019-03-07 11:13:58 +08:00
周有松 d1511914a9 Merge pull request #1157 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-username to release/2.6.0 
* commit 'e74d3f61cbe960c087a43c6fe2184b700609838d':
  imagetools add RHEL dist
  统一aws登录用户名
  统一aliyun登录用户名
  使用公有云镜像时，正确设置登录用户名
 2019-03-07 10:55:33 +08:00
邱剑 9339bee71c Merge pull request #1173 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-image-list-fix to release/2.6.0 
* commit '0bb016d4431c937da79a788f6977ffd47d718aa7':
  过滤掉不支持的huawei skus & image
 2019-03-06 23:55:01 +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
TangBin 0bb016d443 过滤掉不支持的huawei skus & image 2019-03-06 21:10: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
邱剑 65188bd7c2 Merge pull request #1165 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-flavor to release/2.6.0 
* commit '53137dec29f6db7d1cf540dc8ed611e480d1b1f0':
  忽略deny规则
  避免创建vpc后wire同步异常
  openstack重置密码不需要重启机器
  修复套餐系统盘盘大小异常问题
 2019-03-05 23:14:45 +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