Commit Graph
6987 Commits
Author SHA1 Message Date
屈轩 adb95b27df 更新vendor 2019-01-02 17:38:59 +08:00
屈轩 935cd5dcac 优先使用hypervisor接口 2019-01-02 17:38:59 +08:00
屈轩 54e3e2fba2 获取openstack compute api version 2019-01-02 17:37:51 +08:00
屈轩 81dc4a0a47 补充openstack v3认证信息 2019-01-02 17:32:38 +08:00
邱剑 2738b13e58 Merge pull request #864 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-huawei-stage-1 to release/2.5.0
* commit '2bb7ac6e453dc961ae3a3de33b72141f4469a2a8':
  restore json tag
  bugfix
  temp
  temp
  temp
  merge huawei cloud
  fix merge
  fix merge
  merge
  huawei cloud sync
2019-01-02 17:28:34 +08:00
Qiu Jian 1061b47afd 修正:镜像通过PUT接口上传后,需要启动image convert tasks 2019-01-02 17:13:47 +08:00
TangBin 2bb7ac6e45 restore json tag 2019-01-02 15:54:01 +08:00
邱剑 4470e76df7 Automatic merge from release/2.4.0 -> release/2.5.0
* commit 'ab05c09886a6ce1eb4678ae23db257301b30db71':
  避免空指针引用
2019-01-02 14:51:43 +08:00
屈轩 8cc586bf2a 避免空指针引用 2019-01-02 14:47:25 +08:00
TangBin bb22881f96 bugfix 2019-01-02 14:26:48 +08:00
TangBin 227a7573a7 temp 2019-01-02 12:30:34 +08:00
TangBin c7c7f6b02e temp 2019-01-02 12:19:30 +08:00
Qiu Jian 98305792e4 loadbalancers CloudregionId changes to create optional 2019-01-02 11:19:14 +08:00
Qiu Jian 2960a0557b 修正:1. 部分字段缺少create:"required|optional" tag导致该字段值未正确初始化
2. climc option struct的json:"-" tag未正确处理
2019-01-02 11:10:06 +08:00
TangBin 6f34236e0c merge huawei cloud 2019-01-02 11:03:10 +08:00
Qiu Jian 0eb41d636a 支持esxi agent,创建主机缺省用vmdk格式的镜像 2019-01-02 02:54:54 +08:00
邱剑 0e90e0225d Merge pull request #863 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-glance-default-rbac-policy to release/2.5.0
* commit 'f413e9c6b44d7b8413375b3960edf95dc213b4f1':
  修正image和yunionconf默认权限
  update vendor
2019-01-02 01:26:37 +08:00
邱剑 a661b52a57 Merge pull request #862 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-image-usage-total-usage to release/2.5.0
* commit 'be80187eb334d053669b6fa1a681aac06c124e24':
  glance的usage指标增加所有镜像(image + iso)的统计
2019-01-02 01:25:42 +08:00
tangbin 4c8bb1b447 fix merge 2019-01-01 17:09:48 +08:00
tangbin b69977460b fix merge 2019-01-01 17:07:43 +08:00
tangbin 764eb09481 merge release/2.5.0 2019-01-01 17:00:23 +08:00
tangbin 66e3e05acd merge 2019-01-01 16:34:35 +08:00
TangBin 3b91a27fc9 huawei cloud sync 2019-01-01 16:21:37 +08:00
Qiu Jian f413e9c6b4 修正image和yunionconf默认权限 2019-01-01 00:48:04 +08:00
Qiu Jian be80187eb3 glance的usage指标增加所有镜像(image + iso)的统计 2018-12-29 22:02:30 +08:00
周有松 bfc71a40ed Automatic merge from release/2.4.0 -> release/2.5.0
* commit '65dd335b4d5be6cee130f7923f5e7725a3d9552b':
  lbagent: 增加haproxy reload健壮性
2018-12-29 20:19:48 +08:00
周有松 ce995c0582 Merge pull request #859 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lbagent-reload to release/2.3.0
* commit '9251c6b45b9886b16f29f2b74909b3d4fcb940d2':
  lbagent: 增加haproxy reload健壮性
2018-12-29 20:19:47 +08:00
周有松 65dd335b4d Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'ce995c0582e056ac18447985eef57c622b261fc6':
  lbagent: 增加haproxy reload健壮性
2018-12-29 20:19:47 +08:00
周有松 793300f1cb Merge pull request #860 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb-cloudregion-optional to release/2.5.0
* commit 'ddbae418a61ef26748ec1954cc22741037d2d51e':
  compute: models: 改正default、required标签使用
  loadbalancers: cloudregion_id字段API兼容
2018-12-29 20:19:33 +08:00
Yousong Zhou ddbae418a6 compute: models: 改正default、required标签使用 2018-12-29 09:42:24 +00:00
Yousong Zhou 86ad0c6fab loadbalancers: cloudregion_id字段API兼容 2018-12-29 09:42:24 +00:00
邱剑 bb8d0b0a48 Merge pull request #858 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-get-extra-details-interface-change to release/2.5.0
* commit '05b4aa815f2ce5b2686082e0ab6f97c027fcb621':
  修正:serverskus的GetExtraDetails接口更改
2018-12-29 17:26:11 +08:00
李泽玺 9a507b9857 Automatic merge from release/2.4.0 -> release/2.5.0
* commit '327e59efcdc088be764d05f90346af3d2aecd1bb':
  fix isolated device update
2018-12-29 17:13:53 +08:00
Qiu Jian 05b4aa815f 修正:serverskus的GetExtraDetails接口更改 2018-12-29 16:48:22 +08:00
Yousong Zhou 9251c6b45b lbagent: 增加haproxy reload健壮性
HAProxy小概率出现stats socket和stats url未监听到的情况,怀疑是00-haproxy.cfg
被提前删除造成,导致后续的-x haproxy.sock配置重加载失败

健壮性增强,reload失败时,杀掉旧进程pid,重新启动新的haproxy
2018-12-29 08:43:36 +00:00
wanyaoqi fb41fcb817 fix isolated device update 2018-12-29 16:39:41 +08:00
邱剑 dbf25ab342 Merge pull request #850 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-glance-golang to release/2.5.0
* commit '8d60bc63c16589a9f5cc7197b2a857eac22ed650':
  update vendor
  minor fixes
  minor improvements
  recode quota and usage for image service
  make image protected show in list
  1. 增加EnableTorrentService选项 2. 增加PerformMarkPublicProtected接口
  use separate worker for long running tasks, such as ImageConvertTask, ImageCheckTask, CloudProviderSyncInfoTask
  minor fixes
  minor fixes
  update vendor & make compatible
  update vendor
  final commit
  temp commit
  move version, qemutil, qemuimg from cloudcommon to util
  fix bugs
  update vendor
  add doc.go && make ParseOptions changes
  update fmt & doc
  glance重构 update 1
  temp commit
2018-12-29 16:32:27 +08:00
邱剑 9eb8e28c27 Automatic merge from release/2.4.0 -> release/2.5.0
* commit '8e1fe97fb1f6253b880af023a9a5653dc4842efc':
  修复: 裸金属服务器分配IP选择错误的网卡
2018-12-29 15:49:39 +08:00
Qiu Jian 8d60bc63c1 update vendor 2018-12-29 15:47:16 +08:00
Zexi Li a9eb4806b2 修复: 裸金属服务器分配IP选择错误的网卡 2018-12-29 14:38:39 +08:00
Qiu Jian 018e372173 minor fixes 2018-12-29 13:43:49 +08:00
邱剑 c7545411b9 Automatic merge from release/2.4.0 -> release/2.5.0
* commit '187b153ef9d37b82761ed1895f21e88276cd5c21':
  避免出现多个externalID相同的快照
2018-12-29 12:49:40 +08:00
邱剑 187b153ef9 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '39f720bec71d4c785500ee5a8b89842a56158f9d':
  避免出现多个externalID相同的快照
2018-12-29 12:49:40 +08:00
邱剑 39f720bec7 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'fc0f8abb49fe7ffcecb09e7cde03bbc6736d60c7':
  避免出现多个externalID相同的快照
2018-12-29 12:49:39 +08:00
李泽玺 257bdb7fdf Automatic merge from release/2.4.0 -> release/2.5.0
* commit '890b75942f7aee742bcdb495acfee57daa785ef1':
  climc: k8s service api
2018-12-29 10:25:09 +08:00
李泽玺 890b75942f Merge pull request #854 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-svc-opt to release/2.4.0
* commit 'c4e34d439a09dc6438408612353098cfbe52ef39':
  climc: k8s service api
2018-12-29 10:25:07 +08:00
Qiu Jian 1e4789285d minor improvements 2018-12-28 20:24:23 +08:00
屈轩 d6771f56da 避免出现多个externalID相同的快照 2018-12-28 15:22:57 +08:00
Zexi Li c4e34d439a climc: k8s service api 2018-12-28 14:55:13 +08:00
邱剑 2a949c635e Automatic merge from release/2.4.0 -> release/2.5.0
* commit '3d36a450850d441973d027d3c5d3e6d49914a53d':
  fix sql query
  更新sku统计关联主机数量函数名称
  move duplicate code to util func
  bufix & add skus guest count
2018-12-28 14:40:34 +08:00