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
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
屈轩 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
wanyaoqi 26baad489e support lvm partition 2019-03-09 10:18:51 +08:00
Qiu Jian 13d8ba02a5 fix: cloudaccount that is in stale syncing status should be auto-synced 2019-03-08 23:22:46 +08:00
Qiu Jian 6646ec8936 fix: baremetal pxeboot fail to find record of preregistered baremetal 2019-03-08 21:36:46 +08:00
万垚奇 1649454d3f Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'eb825342799c2b4a43a822cba84b0906887cd35f':
  修复: joint 的对象创建时没有检验是否存在，会被重复添加
 2019-03-08 21:26:05 +08:00
邱剑 7032617d78 Merge pull request #1191 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-renew-prepaid-recycle-sanity-check to release/2.6.0 
* commit 'e62ceb5007e57d71e4f049640528b91a20ae86f6':
  show expired_at colume for host
  fix: validate host status before doing renew prepaid recycle
 2019-03-08 21:07:05 +08:00
屈轩 33aa2e8a9e 优化获取ceph storage存储大小方式 2019-03-08 19:52:52 +08:00
Zexi Li 57a2a475ef 修复: joint 的对象创建时没有检验是否存在，会被重复添加 2019-03-08 19:08:35 +08:00
TangBin 9f81a2b8dc add huawei renew isntance 2019-03-08 18:07:24 +08:00
周有松 ccbebfdafd Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '6ad0de9608050bbdb8ad88fd7a4241a9be07307f':
  fix: to make it consistent, change cloudproviderregion auto_sync to enable_auto_sync
 2019-03-08 17:41:34 +08:00
周有松 6ad0de9608 Merge pull request #1190 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-sync-with-lock to release/2.7.0 
* commit '9d5ef350fca63e1bf8544531973be0494076b3d2':
  fix: to make it consistent, change cloudproviderregion auto_sync to enable_auto_sync
 2019-03-08 17:41:34 +08:00
屈轩 079e39def0 如果挂载磁盘失败, 记录失败日志 2019-03-08 16:46:21 +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
Qiu Jian e62ceb5007 show expired_at colume for host 2019-03-08 00:09:48 +08:00
Qiu Jian d23414f3f6 fix: validate host status before doing renew prepaid recycle 2019-03-08 00:01:14 +08:00
Qiu Jian 76bab2c693 fix: 1. skip using temporary binding mac at host startup 2. active 
baremetal NIC index always reset to 0
 2019-03-07 23:01:55 +08:00
Qiu Jian 98565a815b fix: allow host attach to same wire with multiple interface 2019-03-07 22:37:17 +08:00
Qiu Jian 9d5ef350fc fix: to make it consistent, change cloudproviderregion auto_sync to 
enable_auto_sync
 2019-03-07 22:35:30 +08:00
周有松 358440748b Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'efb82d177edf70e522b6208bfe1e56d15eb15104':
  补充缺少导入的包
 2019-03-07 19:24:49 +08:00
屈轩 640d4464be 补充缺少导入的包 2019-03-07 18:05:26 +08:00
万垚奇 e4fc18b59a Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'e0db43c8907f92585ca815f37130b59414970f6e':
  add hotplug check
 2019-03-07 17:50:29 +08:00
万垚奇 e0db43c890 Merge pull request #1172 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/cpu-mem-wyq/hotplug to release/2.7.0 
* commit '7c39255ef75158324e597b096a596f02c36fad48':
  add hotplug check
 2019-03-07 17:50:29 +08:00
周有松 244fa55a7a Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '68fd0c3b064e98e34dedb945c56c7170cb3e404a':
  更新成功后才添加日志记录
 2019-03-07 17:24:38 +08:00
屈轩 8a117aac75 更新成功后才添加日志记录 2019-03-07 17:22:01 +08:00
周有松 9067393496 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'a97e2faea83578ae8495ab2e4a3bb22bbfcfde4c':
  修正一些错误信息描述
 2019-03-07 16:57:59 +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
周有松 328d5396ee Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '8e5f047a9b448fa3842bbe6f792e915de1306977':
  私有云套餐被错误过滤掉fix
 2019-03-07 16:22:25 +08:00
周有松 8e5f047a9b Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '9aa91fc88acdc44ed220205af87d7699071b5e86':
  私有云套餐被错误过滤掉fix
 2019-03-07 16:22:25 +08:00
周有松 9aa91fc88a Merge pull request #1182 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-import-image-bugfix to release/2.6.0 
* commit 'd38f38dfb7fe3710df693aac93bea93ddbc2e657':
  私有云套餐被错误过滤掉fix
 2019-03-07 16:22:24 +08:00
邱剑 c09e93ed0b Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '959bc3ec20a89f5da29ceafba08bafed7ccbb251':
  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
邱剑 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
TangBin d38f38dfb7 私有云套餐被错误过滤掉fix 2019-03-07 15:46:23 +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
万垚奇 9419405ba1 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '3fa13e38018d796cb723dba148e9ca39adcee30d':
  修复: host kube agent 相关 task 没有正确通知 k8s service
 2019-03-07 15:22:35 +08:00
万垚奇 3fa13e3801 Merge pull request #1180 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-host-kube-handler to release/2.7.0 
* commit '3c430a637b1913c3aa4fcc30a803b6912b124430':
  修复: host kube agent 相关 task 没有正确通知 k8s service
 2019-03-07 15:22:35 +08:00
Zexi Li 3c430a637b 修复: host kube agent 相关 task 没有正确通知 k8s service 2019-03-07 15:20:04 +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
周有松 3b4796bd3b Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '6bd1afa91762870777d2d4538897db9f5f5f3525':
  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
Qiu Jian 87284d48c8 fix: huawei filter excludes skus with null providers 2019-03-07 15:02:08 +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
周有松 6cf678e809 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '09fe040285299bc0155d2e4c049c8400b067c086':
  避免deploy任务结束时检查系统盘id与返回的磁盘id不匹配导致任务失败
 2019-03-07 14:47:14 +08:00