Commit Graph
2523 Commits
Author SHA1 Message Date
屈轩 42589ad68f 尽可能的同步openstack host信息 2019-03-09 14:37:07 +08:00
Zexi Li 57a2a475ef 修复: joint 的对象创建时没有检验是否存在,会被重复添加 2019-03-08 19:08:35 +08:00
Qiu Jian 1cfd7e26f2 fix: isActive error message include filename 2019-03-05 10:20:23 +08:00
Qiu Jian e289549e5d fix: not set converting status 2019-03-05 09:48:36 +08:00
Qiu Jian 068ad7b141 fix: glance image convert consume too much IO, use ionice -c idle to
reduce its IO impact
2019-03-05 02:29:27 +08:00
屈轩 2fa4d761e7 冲突解决 2019-03-04 21:21:14 +08:00
邱剑 66354e8cc4 Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'bc37559720bce37130fda048f3dc36a3d9cb11cb':
  避免多次编码后,qcloud不能解开url编码
2019-03-04 21:18:17 +08:00
屈轩 798b595dfb 避免多次编码后,qcloud不能解开url编码 2019-03-04 21:12:41 +08:00
万垚奇 0a3a820e57 Automatic merge from release/2.4.0 -> release/2.5.0
* commit 'fa53945d3fed352f73247fc7f99b03f4b71d8c2d':
  避免插入异常数据
2019-03-04 11:58:06 +08:00
屈轩 2235e1210c 避免插入异常数据 2019-03-04 11:41:32 +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
屈轩 1c8eeb317a 限制endpoint范围 2019-02-28 15:50:55 +08:00
屈轩 e6bfe279a1 支持openstack选择对应的endpoint类型 2019-02-28 15:23:41 +08:00
TangBin ecc653f0a1 parameter create fix 2019-02-26 18:29:32 +08:00
邱剑 fb6d410b2a Automatic merge from release/2.4.0 -> release/2.5.0
* commit '2d53d2c569dedbe0d09773b5aca46305331fd68f':
  去除调试信息
  避免过滤cloudprovider失效
2019-02-25 12:27:48 +08:00
屈轩 9c36d6945a 冲突解决 2019-02-25 12:06:38 +08:00
邱剑 a7db0fe024 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '554f7fa0a07329180a878f3bf9d1fe9e04bd1203':
  去除调试信息
  避免过滤cloudprovider失效
2019-02-25 11:56:01 +08:00
屈轩 4c01b7ad2a 去除调试信息 2019-02-25 11:51:21 +08:00
屈轩 7420fddad5 避免过滤cloudprovider失效 2019-02-25 11:37:16 +08:00
邱剑 ebec65e46f Automatic merge from release/2.4.0 -> release/2.5.0
* commit '503729880a22f5cd05439ac180ab7c72b0b55193':
  minor fix
  fix: find empty endpoints due to invalid duplicate service
2019-02-21 19:53:10 +08:00
Qiu Jian c624341b19 minor fix 2019-02-21 18:48:50 +08:00
Qiu Jian 2a6737061d fix: find empty endpoints due to invalid duplicate service 2019-02-21 18:16:17 +08:00
屈轩 f4cf4ab93d 识别openstack protocol 2019-02-21 15:25:01 +08:00
邱剑 d84a5fc16a Merge pull request #1087 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-vmware-reference-nil-objects to release/2.5.0
* commit '72d8dd8961e55a0190330bfea085710b1e77d4ba':
  fix: esxi references2Objects refer nil objects
2019-02-21 12:34:02 +08:00
李泽玺 695ed4cbd3 Automatic merge from release/2.4.0 -> release/2.5.0
* commit '9e24e124f49123376490a091665e33c229a74db1':
  fix: temporay auth failure may invalidate valid admintoken
2019-02-21 12:10:29 +08:00
Qiu Jian 588976672f fix: temporay auth failure may invalidate valid admintoken 2019-02-21 12:08:19 +08:00
Qiu Jian 72d8dd8961 fix: esxi references2Objects refer nil objects 2019-02-20 23:13:27 +08:00
邱剑 fb4592a4fa Automatic merge from release/2.4.0 -> release/2.5.0
* commit '6ec91d6f4dd6ebf539369987fd829738bb6c0cbf':
  识别新版vmdk
2019-02-19 17:34:30 +08:00
屈轩 323836b1f8 识别新版vmdk 2019-02-19 17:25:55 +08:00
李泽玺 b3298751e5 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'fd7f91f5c6f06f0714b88665098effa96ca83e60':
  fix: zone create nil pointer access error
2019-02-18 18:56:21 +08:00
李泽玺 4af23de378 Automatic merge from release/2.4.0 -> release/2.5.0
* commit 'bac6404b4aec30c206ac68c1f8defc2b220ebc24':
  fix: zone create nil pointer access error
2019-02-18 18:56:21 +08:00
李泽玺 bac6404b4a Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'b3298751e5f1954b527c7d76112c867b977860d8':
  fix: zone create nil pointer access error
2019-02-18 18:56:21 +08:00
李泽玺 fd7f91f5c6 Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'c326650e7ada90922639f8368fbc06b5922a3ad2':
  fix: zone create nil pointer access error
2019-02-18 18:56:20 +08:00
李泽玺 c326650e7a Automatic merge from release/2.0.0 -> release/2.1.0
* commit 'adcef3a561c3c8b4a5daffc0b120b8c89292b108':
  fix: zone create nil pointer access error
2019-02-18 18:56:20 +08:00
邱剑 274e31d858 Merge pull request #1076 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-public-private-cloud to release/2.5.0
* commit '2ffe44a38355f7201efd30abc4f4700b9a8e42cb':
  通过provider is_public_cloud区分公有云私有云
2019-02-18 18:29:45 +08:00
屈轩 2ffe44a383 通过provider is_public_cloud区分公有云私有云 2019-02-18 17:43:31 +08:00
Qiu Jian c283b5864e fix: zone create nil pointer access error 2019-02-18 16:13:32 +08:00
邱剑 0851d28381 Automatic merge from release/2.4.0 -> release/2.5.0
* commit '569e3d00946e58f03d0b386795ea1e612c0fc04a':
  解决冲突
2019-02-18 10:46:22 +08:00
屈轩 378ba9bf04 解决冲突 2019-02-18 10:23:12 +08:00
邱剑 f8669e5844 Automatic merge from release/2.4.0 -> release/2.5.0
* commit '869a015cc83f7555342f933812b7ef5b32fc7f41':
  修改超售比后立即刷新调度缓存
2019-02-16 22:21:28 +08:00
邱剑 869a015cc8 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '4c6177bffac961d684f970e85bfbcc68f4ec022f':
  修改超售比后立即刷新调度缓存
2019-02-16 22:21:28 +08:00
屈轩 423ef544e2 修改超售比后立即刷新调度缓存 2019-02-16 17:31:05 +08:00
Qiu Jian a7faa9b318 minor changes 2019-02-16 01:25:16 +08:00
Qiu Jian 6de65ba419 fix: converted host configuration always use http as keystone protocol 2019-02-15 23:05:30 +08:00
邱剑 713fa7d7bb Automatic merge from release/2.4.0 -> release/2.5.0
* commit 'c44a7f8407cca4db2a97caa93908966a1565d7f4':
  全量同步后立即更新cloudaccount状态
2019-02-15 19:58:38 +08:00
邱剑 c44a7f8407 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '6528992b5be15b5cfba35dce770c272f98d4c452':
  全量同步后立即更新cloudaccount状态
2019-02-15 19:58:37 +08:00