Commit Graph
485 Commits
Author SHA1 Message Date
Yousong Zhou 0eee9eb674 treewide: 280: group imports with goimports
./goimports -w -local yunion.io/x/onecloud/ -corp yunion.io/x/ $GOPATH/src/yunion.io/x/onecloud/{cmd,pkg}
2019-03-13 13:37:16 +00:00
邱剑 1042edc5ac Automatic merge from release/2.7.0 -> release/2.8.0
* commit '8ffa110034e7bb680a6bba83c89dee1a355903e7':
  treewide: group imports with goimports
  fix disk resize
2019-03-13 21:36:22 +08:00
Yousong Zhou 4c82dae39b Merge remote-tracking branch 'origin/release/2.6.0' into bugfix/yousong-goimports-270 2019-03-13 13:33:51 +00:00
Yousong Zhou 8fe4f2ec98 treewide: group imports with goimports
./goimports -w -local yunion.io/x/onecloud/ -corp yunion.io/x/ $GOPATH/src/yunion.io/x/onecloud/{cmd,pkg}
2019-03-13 10:46:12 +00:00
TangBin d9baf4c462 soldout skus fix & add more comment 2019-03-13 12:09:59 +08:00
周有松 3abb73a9b0 Automatic merge from release/2.6.0 -> release/2.7.0
* commit 'f0f6172156f0c693117ee6dc77c9c54bc4f942ba':
  lbagent: fix corpus versioning
  mcclient: options: ignore ID when converting to params
  lbagent: telegraf: add params influx_db_output_unsafe_ssl
  mcclient: lbagent: allow setting telegraf config template
  lb: 不记录来自lbagent的GET查询请求
  treewide: s/HasSystemAdminPrivelege/HasSystemAdminPrivilege/g
2019-03-12 16:47:25 +08:00
周有松 1e14de7d4a Automatic merge from release/2.7.0 -> release/2.8.0
* commit '3abb73a9b047e3e40577bbd604627c984a3527ca':
  lbagent: fix corpus versioning
  mcclient: options: ignore ID when converting to params
  lbagent: telegraf: add params influx_db_output_unsafe_ssl
  mcclient: lbagent: allow setting telegraf config template
  lb: 不记录来自lbagent的GET查询请求
  treewide: s/HasSystemAdminPrivelege/HasSystemAdminPrivilege/g
2019-03-12 16:47:25 +08:00
Yousong Zhou 07f98779ad treewide: s/HasSystemAdminPrivelege/HasSystemAdminPrivilege/g 2019-03-12 03:39:20 +00:00
邱剑 ac88ff6869 Automatic merge from release/2.7.0 -> release/2.8.0
* commit '4d0ff01a858313bd74ef6cc030b3bcdd7c0c1238':
  fix: recode host.getWiresOfId
  Make minimal sysdisk size to 10G
  fix: RHEL fsdirver fail to deploy networking scripts
  feature: nic bonding/teaming support on region
  feature: nic binding support
2019-03-11 15:26:52 +08:00
Qiu Jian 8815193f33 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190311
Conflicts:
	pkg/compute/guestdrivers/aws.go
	pkg/compute/guestdrivers/huawei.go
	pkg/compute/guestdrivers/openstack.go
	pkg/compute/models/guests.go
	pkg/compute/models/hosts.go
2019-03-11 15:03:25 +08:00
Qiu Jian 7bdab6e02d feature: nic bonding/teaming support on region 2019-03-11 04:45:34 +08:00
邱剑 37e0399b0c Automatic merge from release/2.7.0 -> release/2.8.0
* commit 'bd576fa9425764531b54b54e8db3012aa9480c7e':
  修复: joint 的对象创建时没有检验是否存在,会被重复添加
  show expired_at colume for host
  fix: validate host status before doing renew prepaid recycle
  fix: 1. skip using temporary binding mac at host startup 2. active baremetal NIC index always reset to 0
  fix: allow host attach to same wire with multiple interface
  fix: huawei filter excludes skus with null providers
  fix: exi host name conversion remove ip
2019-03-09 19:40:32 +08:00
Zexi Li c94ec06dc2 Merge remote-tracking branch 'origin/release/2.6.0' into confict/lzx-resolv-20190309 2019-03-09 14:02:36 +08:00
邱剑 7032617d78 Merge pull request #1191 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-renew-prepaid-recycle-sanity-check to release/2.6.0
* commit 'e62ceb5007e57d71e4f049640528b91a20ae86f6':
  show expired_at colume for host
  fix: validate host status before doing renew prepaid recycle
2019-03-08 21:07:05 +08:00
Qiu Jian e62ceb5007 show expired_at colume for host 2019-03-08 00:09:48 +08:00
Qiu Jian 98565a815b fix: allow host attach to same wire with multiple interface 2019-03-07 22:37:17 +08:00
邱剑 c09e93ed0b Automatic merge from release/2.7.0 -> release/2.8.0
* commit '959bc3ec20a89f5da29ceafba08bafed7ccbb251':
  conditional compilation: compile rbd on linux only
  update vendor
  improvements: autonomously adjust sync interval according to resources in region
  skip objects that is undergoing a task
  fix: resolve import loop between skus and models, merge skus into models
  feature: allow auto sychrnoization of cloud account
2019-03-07 16:08:00 +08:00
邱剑 959bc3ec20 Merge pull request #1148 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-sync-with-lock to release/2.7.0
* commit '52ab56fa3f338caaed7a7a9ff3bc45a8f2f661eb':
  conditional compilation: compile rbd on linux only
  update vendor
  improvements: autonomously adjust sync interval according to resources in region
  skip objects that is undergoing a task
  fix: resolve import loop between skus and models, merge skus into models
  feature: allow auto sychrnoization of cloud account
2019-03-07 16:08:00 +08:00
Qiu Jian 52ab56fa3f Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock
Conflicts:
	pkg/compute/guestdrivers/aws.go
2019-03-07 15:22:58 +08:00
万垚奇 9419405ba1 Automatic merge from release/2.7.0 -> release/2.8.0
* commit '3fa13e38018d796cb723dba148e9ca39adcee30d':
  修复: host kube agent 相关 task 没有正确通知 k8s service
2019-03-07 15:22:35 +08:00
Zexi Li 3c430a637b 修复: host kube agent 相关 task 没有正确通知 k8s service 2019-03-07 15:20:04 +08:00
邱剑 b7c689cacd Merge pull request #1170 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-keystone-credential-totp-api to release/2.8.0
* commit '929085d68b0eecf6e6e6b477a4f9b2637ae99afe':
  feature: add API to access TOTP/recovery secrets via keystone credential API
2019-03-06 23:22:26 +08:00
Qiu Jian 929085d68b feature: add API to access TOTP/recovery secrets via keystone credential
API
2019-03-06 19:53:03 +08:00
郑家杰 fb8365eeff Merge pull request #1169 in YUNIONIO/onecloud from feature/zhengjj-add-cloud-sku-rates to release/2.7.0
* commit '2216f01ab955f03008759ce72c87fc04fdf569c9':
  zhengjj-add-cloud-sku-rates
  zhengjj-add-cloud-sku-rates
2019-03-06 18:25:41 +08:00
zhengjiajie 54acc594c9 zhengjj-add-cloud-sku-rates 2019-03-06 17:31:33 +08:00
Qiu Jian 8eb4a74c8b Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock
Conflicts:
	pkg/compute/guestdrivers/base.go
2019-03-06 01:39:17 +08:00
Qiu Jian cb23c9c1a1 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 2019-03-06 00:11:44 +08:00
邱剑 35f5a59dbb Merge pull request #1141 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/cpu-mem-wyq/hotplug to release/2.7.0
* commit '9963a5f2a161abfe5e6ce53a4dad29ad67aaedb0':
  change config add scheduler check
  fix hotlpug
  kvm guest support hotplug cpu mem, fix hmp monitor
2019-03-05 23:13:33 +08:00
邱剑 d67dc81755 Merge pull request #1154 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-add-sku-list-query-condition to release/2.7.0
* commit '99fbe5575d83c6d0b35d5e961dbe2f5dff0b7a25':
  getNameAndExtId fix
  remove provider from zone/region name
  remove duplicate code
  skus list result add region&zone external id
2019-03-05 16:30:45 +08:00
TangBin d8c9772462 remove duplicate code 2019-03-05 15:35:08 +08:00
wanyaoqi 9963a5f2a1 change config add scheduler check 2019-03-05 15:02:21 +08:00
wanyaoqi 46e85d5249 kvm guest support hotplug cpu mem, fix hmp monitor 2019-03-05 14:29:12 +08:00
邱剑 fb5adf56c0 Merge pull request #1156 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-external-project to release/2.7.0
* commit '0ce6b70998e5646b7f1a1f0f610b003132fab980':
  更改ProjectSource -> ProjectSrc
  同步openstack项目
  同步azure项目
  腾讯云加入debug信息
  external_project去掉cloudregion属性
  补充其他资源项目同步
  映射表默认指向provider的project
  init
2019-03-05 12:12:54 +08:00
屈轩 0ce6b70998 更改ProjectSource -> ProjectSrc 2019-03-05 12:05:02 +08:00
Qiu Jian ef197ca3d0 improvements: autonomously adjust sync interval according to resources in region 2019-03-05 02:35:20 +08:00
屈轩 10d4ca66c0 init 2019-03-04 16:36:47 +08:00
Zexi Li 1c8b745860 scheduler: add scheduler forecast api 2019-03-04 14:06:01 +08:00
Qiu Jian 605cbb2558 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 2019-03-04 01:42:39 +08:00
Qiu Jian 62ebc90f2a feature: allow auto sychrnoization of cloud account 2019-03-04 01:09:34 +08:00
邱剑 9efe501319 Automatic merge from release/2.6.0 -> release/2.7.0
* commit '4f6ac33f4cbb37447ab77274aa97e614d5e38149':
  server disk list add storage type
2019-03-01 12:26:42 +08:00
wanyaoqi f171f9b935 server disk list add storage type 2019-03-01 11:53:55 +08:00
李泽玺 73d8cf11d9 Merge pull request #1123 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-cluster-api to release/2.7.0
* commit 'b6fe9b80592be6a080c981c8af32a7ae293c5b84':
  k8s multi cluster api
2019-02-28 16:20:28 +08:00
Zexi Li b6fe9b8059 k8s multi cluster api 2019-02-28 16:20:09 +08:00
zhengjiajie 4f7f3dabce zhengjj-add-bill-cloudchecks 2019-02-28 15:45:48 +08:00
TangBin 4f6fa10cf0 skus list result add region&zone external id 2019-02-27 16:52:01 +08:00
TangBin 82db81debc sku list add more query 2019-02-26 17:47:38 +08:00
Qiu Jian 8e56608e54 fix: batch result include complete jsonerror instead of just details 2019-02-21 12:32:09 +08:00
张东亮 cdb12a1354 Merge pull request #1063 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-logger-record-start-time to release/2.6.0
* commit '9f35039209c5a9251d05ad720012531a50f8cc8b':
  add service tag for actionlog
  make fmt
  fix: logger did not record start time of events
2019-02-18 12:25:16 +08:00
Qiu Jian 9f35039209 add service tag for actionlog 2019-02-18 01:13:40 +08:00
Qiu Jian a72ae86082 fix: send system notification to specific users or groups 2019-02-16 01:46:39 +08:00