opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 06:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,180 Commits 27 Branches 687 Tags
93bc41c1671c16e1c1a26de4e32f9f405e270a3d
Commit Graph
332 Commits
Author SHA1 Message Date
邱剑 93bc41c167 Merge pull request #291 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloud-account to release/2.3.0 
* commit 'e7bd5dfa66588a8e8fd2bcfb93ce401641945bc2':
  减少调用层级
  支持云账号主次之分
 2018-10-17 21:16:44 +08:00
屈轩 e7bd5dfa66 减少调用层级 2018-10-17 21:03:12 +08:00
邱剑 f7ba920b90 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '20cf5be92a7df191690aeceea66a421fea0a8865':
  调整带宽 task: CLOUD-561云服务器调整带宽后，操作日志记录的内容应该准确
  增加日志服务黑名单，去掉配置服务的操作日志
 2018-10-17 17:43:46 +08:00
邱剑 20cf5be92a Merge pull request #299 in YUNIONIO/onecloud from bugfix/rex-20181016-aliyun-reset-actionlog to release/2.2.0 
* commit '1736eacb2157825a5c91daed4d977b26f18d6d92':
  调整带宽 task: CLOUD-561云服务器调整带宽后，操作日志记录的内容应该准确
  增加日志服务黑名单，去掉配置服务的操作日志
 2018-10-17 17:43:46 +08:00
Zhang Dongliang 1736eacb21 调整带宽 task: CLOUD-561云服务器调整带宽后，操作日志记录的内容应该准确 2018-10-17 16:18:17 +08:00
邱剑 05efb6c116 Merge pull request #296 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-dnsrecrods-enabled to release/2.3.0 
* commit '7e3e8a01ce2c0a2251c4f05d12b1cfdda71b26a0':
  dns: fix compilation error
  climc: add dns-enable, dns-disable
  dnsrecords: add enabled field
 2018-10-16 19:42:29 +08:00
屈轩 8ef86da0de Merge branch 'release/2.3.0' of ssh://git.yunion.io/~quxuan/onecloud into hotfix/qx-cloud-account 2018-10-16 18:38:47 +08:00
李泽玺 6a9ba82120 Merge pull request #292 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-host-usable-filter to release/2.3.0 
* commit '98dc897eeb29c9adc2b080e87857e11b28fb73e7':
  增加：host-list增加usable过滤器
 2018-10-16 18:08:15 +08:00
邱剑 9f6db4f986 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '988adf7bd84dec69115a548bf1860af1fe1e27ca':
  add snapshot-list filter by storage type
 2018-10-16 17:23:46 +08:00
Yousong Zhou d6cd05079e dnsrecords: add enabled field 
CLOUD-586
 2018-10-16 09:11:43 +00:00
wanyaoqi 374d531931 add snapshot-list filter by storage type 2018-10-16 16:59:52 +08:00
邱剑 8772c01004 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'fb84a9e5086f74418a1f2a2352b926ff4effd34a':
  add disk-create-snapshot, bug fix
 2018-10-16 13:55:19 +08:00
wanyaoqi e0751c0e15 add disk-create-snapshot, bug fix 2018-10-16 13:52:54 +08:00
Qiu Jian 98dc897eeb 增加：host-list增加usable过滤器 2018-10-15 21:39:48 +08:00
屈轩 197f1b32ee 支持云账号主次之分 2018-10-15 18:29:11 +08:00
邱剑 219015d50c Merge pull request #287 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-keypair-improvment to release/2.3.0 
* commit 'cfa4f5db945dcef09137c712370edcb3d8e33593':
  server show expired_at column
  修正：1. 阿里云自动设置Import/Export image ram授权，不再需要手动授权 2. 修正公有云注入userdata的问题
  Update vendor
  Update format
  Force format before build
  minor updates
  Update vendor
  改进：1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3. 其他
 2018-10-15 18:20:30 +08:00
李泽玺 0cdf25150c Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '0f8f7e570ea1c99431a03193d55addef5f360830':
  add snapshot details
 2018-10-15 11:02:09 +08:00
Qiu Jian 23443c07bc 修正：1. 阿里云自动设置Import/Export image ram授权，不再需要手动授权 2. 
修正公有云注入userdata的问题
 2018-10-13 20:36:15 +08:00
wanyaoqi 383ec5966a add snapshot details 2018-10-12 17:50:00 +08:00
邱剑 d6c6b559db Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '5f8d6d5109c7dbbd4e058518cc1df444ba2b9972':
  在VM的diskinfo详情中增加image_id和image信息
 2018-10-12 12:24:09 +08:00
邱剑 5f8d6d5109 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '21f1c5f15f775510f08659c5b7298f1adf0b7e0e':
  在VM的diskinfo详情中增加image_id和image信息
 2018-10-12 12:24:09 +08:00
Qiu Jian b17b24b232 Update format 2018-10-12 12:13:35 +08:00
Qiu Jian deda9f70a6 minor updates 2018-10-12 12:09:35 +08:00
Qiu Jian 7a557668fa 在VM的diskinfo详情中增加image_id和image信息 2018-10-11 23:28:03 +08:00
Qiu Jian 17175bc0a4 改进：1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3. 
其他
 2018-10-11 23:04:42 +08:00
邱剑 e865fc725c Merge pull request #278 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-region-guest-count to release/2.1.0 
* commit '749c1daac19f4f3a894488f80c1b212e9f168d6c':
  修复查询defautl region时guests count异常
 2018-10-09 21:59:37 +08:00
邱剑 6b25ce03b6 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '1c9c74461ca4b9028780f553839e29b4c57b0c26':
  修复查询defautl region时guests count异常
 2018-10-09 21:59:37 +08:00
邱剑 1c9c74461c Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e865fc725ce4befd23b5934dcca1db304e54f45b':
  修复查询defautl region时guests count异常
 2018-10-09 21:59:37 +08:00
屈轩 749c1daac1 修复查询defautl region时guests count异常 2018-10-09 21:56:39 +08:00
周有松 f7895cb29f Merge pull request #245 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-loadbalancer to release/2.3.0 
* commit 'af6946ebb5bc0f39a7c2429c9313b6b4053ec6ab':
  loadbalancer: initial version
  loadbalancer: add loadbalancernetworks
  validators: validate certs and keys
  build.sh: support specifying runtime requires
 2018-09-30 18:29:03 +08:00
Yousong Zhou af6946ebb5 loadbalancer: initial version 2018-09-30 08:37:37 +00:00
wanyaoqi bf55d0ef3e add server restart 2018-09-30 15:20:41 +08:00
邱剑 28f806819c Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'a563dc78e3740ddd13b9f39201e0f20820b37e4f':
  显示安全组规则
  fix: climc prompt for macos
 2018-09-30 10:27:31 +08:00
Qiu Jian 127302cb3b Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180930 
Conflicts:
	pkg/compute/models/secgroups.go
 2018-09-30 10:21:22 +08:00
Yousong Zhou aef6996fb0 loadbalancer: add loadbalancernetworks 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
屈轩 8fc8d892fa 显示安全组规则 2018-09-29 18:23:22 +08:00
屈轩 eb95ee7156 添加region对guest统计数据 2018-09-29 11:50:13 +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
邱剑 5f6033fcae Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'abd31a2fb8c9622d5b0d531b3df914101832eb33':
  cloudprovider返回虚机数量信息
 2018-09-27 18:26:34 +08:00
屈轩 873724b1fb cloudprovider返回虚机数量信息 2018-09-27 18:20:44 +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
屈轩 072c4b8a1f 全量同步时默认不创建默认resourcegroup,延迟到创建资源时创建 2018-09-27 10:20:43 +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
邱剑 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
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
屈轩 6e966b90ee bugfix 2018-09-20 20:46:37 +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