opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 07:21:36 +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
邱剑 306b9d770c Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'dcf7c00dcb3725e7745036e7c977d6fe4e06bcd7':
  添加超时处理
  添加admin参数
  支持ssh webconsole
 2018-09-30 10:15:24 +08:00
邱剑 dcf7c00dcb Merge pull request #259 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-webconsole to release/2.1.0 
* commit '28d59c5ebd6258a80b98e41b58038d098220d31a':
  添加超时处理
  添加admin参数
  支持ssh webconsole
 2018-09-30 10:15:24 +08:00
邱剑 1a36186284 Merge pull request #267 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-sec-detail to release/2.0.0 
* commit '8fc8d892fae001d5e5e988113a40d8bf4e1b84ad':
  显示安全组规则
 2018-09-30 10:15:01 +08:00
Yousong Zhou aef6996fb0 loadbalancer: add loadbalancernetworks 2018-09-29 14:12:59 +00:00
Yousong Zhou a8a19c4de9 validators: validate certs and keys 2018-09-29 14:12:59 +00:00
邱剑 3b2f688d80 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '6ec41ea388fcc9a50b4d412a842a788e482c18b9':
  添加region对guest统计数据
 2018-09-29 20:01:51 +08:00
邱剑 6ec41ea388 Merge pull request #261 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-region-guest to release/2.1.0 
* commit 'eb95ee71562c287c915cf4f4402bc71604bce3a0':
  添加region对guest统计数据
 2018-09-29 20:01:50 +08:00
李泽玺 fa1475132b Merge pull request #268 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/meter-dashboard-data-api to release/2.2.0 
* commit 'e15bcc9d371e828097b0be29de12ec35dbda5a09':
  add meter dashboard data api
 2018-09-29 19:33:59 +08:00
zhengjiajie e15bcc9d37 add meter dashboard data api 2018-09-29 19:20:09 +08:00
屈轩 8fc8d892fa 显示安全组规则 2018-09-29 18:23:22 +08:00
屈轩 28d59c5ebd 添加超时处理 2018-09-29 16:50:08 +08:00
邱剑 32598e4f5d Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '9f84448d2e964869edb4ad27395b054cbc3fffe2':
  修正：伪删除虚拟机的时候，如果虚拟机停机失败，会真删除虚拟机
  Add baremetal agent support
 2018-09-29 12:32:30 +08:00
屈轩 eb95ee7156 添加region对guest统计数据 2018-09-29 11:50:13 +08:00
张东亮 51f5c45eb3 Merge pull request #256 in YUNIONIO/onecloud from feature/rex-autoupdate-20180928-1052 to release/2.2.0 
* commit '1bf947869322befa2811b8fbe55dd0dbbf81eb2d':
  autoupdate support for onecloud
 2018-09-29 09:47:37 +08:00
Qiu Jian de45cf507e Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180928 
Conflicts:
	pkg/compute/tasks/guest_delete_task.go
 2018-09-28 23:19:32 +08:00
邱剑 0f4ce95f46 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '510b80dfeb1ee08be0dbfbc04140fc8e4073a82d':
  validators: ValidatorStruct: update input data with validated struct
 2018-09-28 14:06:12 +08:00
Yousong Zhou 8eac303dbf validators: ValidatorStruct: update input data with validated struct 2018-09-28 04:07:57 +00:00
Zhang Dongliang 1bf9478693 autoupdate support for onecloud 2018-09-28 11:24:51 +08:00
邱剑 5f6033fcae Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'abd31a2fb8c9622d5b0d531b3df914101832eb33':
  cloudprovider返回虚机数量信息
 2018-09-27 18:26:34 +08:00
邱剑 abd31a2fb8 Merge pull request #255 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudprovider-sum-guest to release/2.1.0 
* commit '873724b1fbdef79890367951896768b24fd849e7':
  cloudprovider返回虚机数量信息
 2018-09-27 18:26:34 +08:00
屈轩 873724b1fb cloudprovider返回虚机数量信息 2018-09-27 18:20:44 +08:00
Qiu Jian 3ff40b8178 修正：伪删除虚拟机的时候，如果虚拟机停机失败，会真删除虚拟机 2018-09-27 18:02:14 +08:00
邱剑 abb9cb6ea6 Merge pull request #251 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-azure-storageaccount to release/2.2.0 
* commit '23a4087c6c5c286be87ced31d248e8c65c473747':
  storageaccount要求全局名称唯一，并不是账号内名称唯一，创建前检查
 2018-09-27 17:38:34 +08:00
邱剑 944cf624b2 Merge pull request #249 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure to release/2.2.0 
* commit '072c4b8a1f741094b0040f2ed242933779ed23b1':
  全量同步时默认不创建默认resourcegroup,延迟到创建资源时创建
 2018-09-27 17:38:21 +08:00
Qiu Jian f80ebd9f91 Add baremetal agent support 2018-09-27 17:07:33 +08:00
邱剑 c2eaabf964 Merge pull request #253 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-interface to release/2.1.0 
* commit '03653febc708d5337024dc88aaaf2165c0d9c43d':
  补充modules interface
 2018-09-27 16:06:52 +08:00
邱剑 306569ddea Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'c2eaabf964a94923e62a82873bd792cb6d7888e2':
  补充modules interface
 2018-09-27 16:06:52 +08:00
屈轩 03653febc7 补充modules interface 2018-09-27 12:04:13 +08:00
屈轩 072c4b8a1f 全量同步时默认不创建默认resourcegroup,延迟到创建资源时创建 2018-09-27 10:20:43 +08:00
屈轩 23a4087c6c storageaccount要求全局名称唯一，并不是账号内名称唯一，创建前检查 2018-09-26 20:43:35 +08:00
TangBin 538a53cd3d init files 2018-09-26 18:31:55 +08:00
邱剑 2e23a840ad Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '4e7702f0ae7a0ca5f70cf408d3129da76300ac61':
  避免私有云安全组规则下发不完成,ruleset后面补充
 2018-09-26 15:48:06 +08:00
邱剑 4e7702f0ae Merge pull request #250 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup to release/2.1.0 
* commit '13c576672baa713385c7a14fabf73aca4ec91f85':
  避免私有云安全组规则下发不完成,ruleset后面补充
 2018-09-26 15:48:06 +08:00
屈轩 13c576672b 避免私有云安全组规则下发不完成,ruleset后面补充 2018-09-26 15:30:39 +08:00
邱剑 8d2498f688 Merge pull request #248 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-notices-create-at-fix to release/2.2.0 
* commit '814badb3d40ce949d309c09f8f7348983a492ae0':
  fix
  fix created_at & add license
 2018-09-25 20:50:21 +08:00
邱剑 94032d6c14 Merge pull request #247 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-host-with-nil-baremetalnetwork to release/2.1.0 
* commit '8e2e19fde9b3d92e41b3b0fad740b44d7608afed':
  hosts: fix possible nil memory access issue
 2018-09-25 20:44:40 +08:00
邱剑 69ba3c9888 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '94032d6c14a8db76e911fab78cfe21416e729cbc':
  hosts: fix possible nil memory access issue
 2018-09-25 20:44:40 +08:00
邱剑 cc158e397b Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '4917e76ece9b576be6caf0962ba19b833cb7abc4':
  避免assign-secgrp参数传递不一致
 2018-09-25 20:41:42 +08:00
邱剑 4917e76ece Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '3aec2d3b3920c8115b24ba1663b5d653f57f090b':
  避免assign-secgrp参数传递不一致
 2018-09-25 20:41:41 +08:00
TangBin 814badb3d4 fix 2018-09-25 15:54:19 +08:00
Yousong Zhou 8e2e19fde9 hosts: fix possible nil memory access issue 
The code allows the existence of a netinterface to exist without
baremetalnetwork info, yet the host-show does not take into account this
relaxation.  Log the error instead of throwing runtime error bomb

[E 180920 04:21:34 appsrv.(*WorkerManager).execCallback.func1(workers.go:64)] WorkerManager exec callback error: runtime error: invalid memory address or nil pointer dereference
goroutine 160 [running]:
runtime/debug.Stack(0xc420789858, 0x527d43, 0x12cec16)
        /home/yunion/.usr/go/goroot-1.10.4/src/runtime/debug/stack.go:24 +0xa7
runtime/debug.PrintStack()
        /home/yunion/.usr/go/goroot-1.10.4/src/runtime/debug/stack.go:16 +0x22
yunion.io/x/onecloud/pkg/appsrv.(*WorkerManager).execCallback.func1(0xc420958440)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/workers.go:65 +0x9e
panic(0x1021780, 0x1dcd4e0)
        /home/yunion/.usr/go/goroot-1.10.4/src/runtime/panic.go:502 +0x229
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONDict).SortedKeys(0x0, 0xc4202cbd7b, 0x0, 0x0)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:521 +0x37
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONDict).String(0x0, 0xc4202cbc5b, 0x0)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:533 +0x5a
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONArray).String(0xc4206145a0, 0xc42046453a, 0x0)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:610 +0x6b
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONDict).String(0xc42000e388, 0xc42046423a, 0x0)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:540 +0xd4
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONDict).String(0xc42000e3b8, 0x1294d5d, 0xc)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:540 +0xd4
yunion.io/x/onecloud/pkg/appsrv.SendJSON(0x13b44c0, 0xc42088e1e0, 0x13c2740, 0xc42000e3b8)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/send.go:27 +0x84
yunion.io/x/onecloud/pkg/appsrv/dispatcher.getHandler(0x13b6740, 0xc4207501b0, 0x13b44c0, 0xc42088e1e0, 0xc42010a000)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/dispatcher/dispatcher.go:165 +0x46a
yunion.io/x/onecloud/pkg/mcclient/auth.Authenticate.func1(0x13b6740, 0xc42088e360, 0x13b44c0, 0xc42088e1e0, 0xc42010a000)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/mcclient/auth/middleware.go:33 +0x1ba
yunion.io/x/onecloud/pkg/appsrv.(*Application).defaultHandle.func1()
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/appsrv.go:271 +0x4a5
yunion.io/x/onecloud/pkg/appsrv.(*WorkerManager).execCallback(0xc4202c8340, 0xc420958440)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/workers.go:72 +0x50
yunion.io/x/onecloud/pkg/appsrv.(*WorkerManager).workerRun(0xc4202c8340, 0x1)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/workers.go:49 +0x78
created by yunion.io/x/onecloud/pkg/appsrv.(*WorkerManager).schedule
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/workers.go:84 +0xcc
 2018-09-25 07:49:25 +00:00
屈轩 7744547c5e 避免assign-secgrp参数传递不一致 2018-09-25 15:26:26 +08:00
TangBin c0437db69c fix created_at & add license 2018-09-25 12:20:18 +08:00
邱剑 17d4ce8f66 Merge pull request #244 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-network-create to release/2.2.0 
* commit 'f0ad662ec0ef278c63f395ef4de291687528a22a':
  修复获取network时未加认证信息
 2018-09-21 18:03:01 +08:00
邱剑 18261c9281 Merge pull request #241 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-parameter-json to release/2.2.0 
* commit '56a6c16aa8cce70f341ad615bfe4637510f9e9bf':
  return json value
 2018-09-21 18:02:10 +08:00
屈轩 9673892de0 添加admin参数 2018-09-21 15:12:59 +08:00
屈轩 18f6c065e1 支持ssh webconsole 2018-09-21 15:05:24 +08:00
屈轩 f0ad662ec0 修复获取network时未加认证信息 2018-09-21 13:28:05 +08:00
屈轩 6e966b90ee bugfix 2018-09-20 20:46:37 +08:00
邱剑 3ad67f0845 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b93d949e9d9e0ebe985b60775655af5276728428':
  zhengjiajie add the post method of project_host
 2018-09-20 19:33:48 +08:00