opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-24 12:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
987 Commits 30 Branches 710 Tags
1bf947869322befa2811b8fbe55dd0dbbf81eb2d
Commit Graph
987 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
邱剑 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
邱剑 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
邱剑 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
邱剑 2e23a840ad Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '4e7702f0ae7a0ca5f70cf408d3129da76300ac61':
  避免私有云安全组规则下发不完成,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
邱剑 3aec2d3b39 Merge pull request #246 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-sec-op to release/2.0.0 
* commit '7744547c5e6cb091269c2296047d265f8163e0b3':
  避免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
屈轩 f0ad662ec0 修复获取network时未加认证信息 2018-09-21 13:28:05 +08:00
李泽玺 71aa5519ca Merge pull request #243 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secgroup-cod to release/2.2.0 
* commit '6e966b90eea95f5081d45526c80c0fc773bb53c0':
  bugfix
 2018-09-21 10:25:22 +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
邱剑 33ec552f15 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '3ad67f084545e115a4ed896a57785045bfb12771':
  zhengjiajie add the post method of project_host
 2018-09-20 19:33:48 +08:00
邱剑 b93d949e9d Merge pull request #242 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:bugfix/add-projecthost to release/2.0.0 
* commit '8716cf3122a6b5c5e38ae5970d889ff8bf9b5c8f':
  zhengjiajie add the post method of project_host
 2018-09-20 19:33:47 +08:00
zhengjiajie 8716cf3122 zhengjiajie add the post method of project_host 2018-09-20 19:10:51 +08:00
邱剑 bacd9e7ce8 Merge pull request #121 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-azure to release/2.2.0 
* commit '6a54305eb24e7690fd62d24fae3f7d86a2663270':
  security sync
  resolve conflict
  resolve conflict
  resolve conflict
  resolve conflict
  image cache
  添加azure云盘创建代码
  update
  update
  添加创建vpc操作
  update
  用户id和subscriptionID放一起
  添加Azure安全组同步
  添加vendor更新
 2018-09-20 18:22:37 +08:00
邱剑 7d019f0e45 Merge pull request #237 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-sync to release/2.1.0 
* commit '3d64601d3978dd1571eba13f179396d33707c1a9':
  避免同步出现重复安全组
 2018-09-20 18:21:55 +08:00
邱剑 3f4c323b4b Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7d019f0e45d5e50628f20240c8ada722b14b5eec':
  避免同步出现重复安全组
 2018-09-20 18:21:55 +08:00
TangBin 56a6c16aa8 return json value 2018-09-20 17:45:25 +08:00
屈轩 6a54305eb2 resolve conflict 2018-09-20 16:29:20 +08:00
屈轩 c753e36f74 resolve conflict 2018-09-20 16:25:46 +08:00
屈轩 3d64601d39 避免同步出现重复安全组 2018-09-20 15:14:55 +08:00
李泽玺 8ac87620fa Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '24e0f1867ff2f1818ac92203b49ed6dc13a96318':
  region: guest min memory size to 8MB
 2018-09-20 12:26:32 +08:00
李泽玺 24e0f1867f Merge pull request #240 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-update-container-mem to release/2.1.0 
* commit '79efc7e2d5e17cbcf84d415d9b017c355bf9540e':
  region: guest min memory size to 8MB
 2018-09-20 12:26:31 +08:00
Zexi Li 79efc7e2d5 region: guest min memory size to 8MB 2018-09-20 11:34:46 +08:00
邱剑 c88a8b55f3 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '901eed81b83ccf79e088f94c85ba2781800c36a3':
  Managed server (aliyun) add manager/manager_id fields
 2018-09-20 11:14:23 +08:00
邱剑 901eed81b8 Merge pull request #239 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-aliyun-server-add-manager-fields to release/2.1.0 
* commit '6fbc45922c0036aa5ecc19c9f62ba801ce50783d':
  Managed server (aliyun) add manager/manager_id fields
 2018-09-20 11:14:23 +08:00
Qiu Jian 6fbc45922c Managed server (aliyun) add manager/manager_id fields 2018-09-20 11:12:14 +08:00
周有松 17b444ee37 Merge pull request #236 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.2.0 
* commit '935d5a85b8660782372e94c10e9db2ece58b338d':
  httperrors: fix formating error messages
 2018-09-20 10:57:26 +08:00
Yousong Zhou 935d5a85b8 httperrors: fix formating error messages 
Fixes 65880ff8 ("mcclient error")

Before and after

	JSONClientError: certificate 55858afc-de3f-4d14-8e09-3de7cd9b8e2c is still referred to by 1 loadbalancerlisteners%!(EXTRA []interface {}=[])
	JSONClientError: certificate 55858afc-de3f-4d14-8e09-3de7cd9b8e2c is still referred to by 1 loadbalancerlisteners
 2018-09-20 02:14:01 +00:00
邱剑 b5ed2666eb Merge pull request #232 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/local-disk-snapshot to release/2.2.0 
* commit '1b44153b1e8c2d6f957f44c0e066398dce026320':
  add validate snapshot name
  aliyun snapshot sync, create, delete; disk reset
 2018-09-20 00:12:52 +08:00
屈轩 03a80615cc resolve conflict 2018-09-19 22:02:01 +08:00