opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,070 Commits 30 Branches 714 Tags
fcd4fd62e2a68f6945728dff50db9787055df419
Commit Graph
617 Commits
Author SHA1 Message Date
邱剑 a4083c663f Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '4d931b20357e8e621645c461388de6a92a477902':
  make fmt
  fix: recode cloud-account-create commands, easier to use
 2019-03-13 20:14:49 +08:00
邱剑 4d931b2035 Merge pull request #1225 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-recode-cloud-account-create-options to release/2.7.0 
* commit '533a629dd43571fa0152cec5d3205e9cd6172a32':
  make fmt
  fix: recode cloud-account-create commands, easier to use
 2019-03-13 20:14:48 +08:00
邱剑 08c3bd8435 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '6828da3feede16654adff79e5166bad514f0b46d':
  fix: use agent manageruri instance of endpoint to visit agents
 2019-03-13 17:39:10 +08:00
邱剑 6828da3fee Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '4cf5c87a5a373f79f2604b512df9b5479f61b9d5':
  fix: use agent manageruri instance of endpoint to visit agents
 2019-03-13 17:39:09 +08:00
Qiu Jian 64bb1b15db fix: use agent manageruri instance of endpoint to visit agents 2019-03-13 11:52:10 +08:00
Qiu Jian 300f4e5163 fix: recode cloud-account-create commands, easier to use 2019-03-13 01:42:07 +08:00
周有松 47c34b47e1 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '6c2c17769de66806ba13fd92770a0ed1867af712':
  fix: zone add filter by host
 2019-03-11 20:24:30 +08:00
周有松 6c2c17769d Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '734a9d47314cac9951090f858170c77771ebd6b2':
  fix: zone add filter by host
 2019-03-11 20:24:29 +08:00
周有松 734a9d4731 Merge pull request #1218 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-zone-add-host-filter to release/2.6.0 
* commit 'ce96f911919ca26bf6d91027f5335102c38ee8d9':
  fix: zone add filter by host
 2019-03-11 20:24:29 +08:00
Qiu Jian ce96f91191 fix: zone add filter by host 2019-03-11 20:22:47 +08:00
邱剑 481eac432d Merge pull request #1184 in YUNIONIO/onecloud from ~NINGYU/onecloud:feature/ningyu-support-overview-meteralert to release/2.8.0 
* commit '46484f16c23147796867723d7203ee47d0a705b1':
  fix: 修正用于过滤指定云平台账号参数的手误，正确参数为account_id
  fix: 列出报警规则时，支持传入可选参数(type, provider, account_id)进行过滤
  fix: 纠正变量变名
  feat: 支持消费总览和账户级别的余额/消费报警
 2019-03-11 17:41:26 +08:00
ningyu 46484f16c2 fix: 修正用于过滤指定云平台账号参数的手误，正确参数为account_id 2019-03-11 17:30:59 +08:00
邱剑 f77ec1ca4c Merge pull request #1210 in YUNIONIO/onecloud from feature/zhengjj-optimize-cloud-sku-rates to release/2.7.0 
* commit '2183f406d91cbaf5bc9b4334f9fe821985867ec5':
  zhengjj modify param_keys comment
  zhengjj-optimize-cloud-sku-rates
 2019-03-11 17:25:46 +08:00
邱剑 109ed75015 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'f77ec1ca4c008d0c263616907dbd4bab7ed0f0b9':
  zhengjj modify param_keys comment
  zhengjj-optimize-cloud-sku-rates
 2019-03-11 17:25:46 +08:00
邱剑 50550c42e0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '4a655258cac12d3d6ff2b377dfc06379b16a4640':
  openstack忽略已存在的安全组规则创建错误
  修复k版openstack不支持id=in:参数
 2019-03-11 17:20:46 +08:00
邱剑 a85b5da6f6 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '50550c42e0b7f602837b685f5f75ac32f440e7c5':
  openstack忽略已存在的安全组规则创建错误
  修复k版openstack不支持id=in:参数
 2019-03-11 17:20:46 +08:00
邱剑 4a655258ca Merge pull request #1203 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-image-kilo to release/2.6.0 
* commit '12b8a66358a9f53cb565da165111f299ab53c665':
  openstack忽略已存在的安全组规则创建错误
  修复k版openstack不支持id=in:参数
 2019-03-11 17:20:45 +08:00
zhengjiajie 2183f406d9 zhengjj modify param_keys comment 2019-03-11 15:35:33 +08:00
ningyu 580ee9cf0b fix: 列出报警规则时，支持传入可选参数(type, provider, account_id)进行过滤 2019-03-11 15:16:10 +08:00
zhengjiajie ac81143b49 zhengjj-optimize-cloud-sku-rates 2019-03-11 13:29:08 +08:00
ningyu 22af6d4e4d fix: 纠正变量变名 2019-03-11 11:32:55 +08:00
周有松 d116336640 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '33c98697f52f6b25e672a15804af135385bcb4a3':
  fix: baremetal pxeboot fail to find record of preregistered baremetal
 2019-03-10 13:52:16 +08:00
周有松 33c98697f5 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '641db5ae2d6cfef4ef24279f6b548706a93ab24b':
  fix: baremetal pxeboot fail to find record of preregistered baremetal
 2019-03-10 13:52:16 +08:00
屈轩 dd286d6b7e 修复k版openstack不支持id=in:参数 2019-03-09 13:26:06 +08:00
Qiu Jian 6646ec8936 fix: baremetal pxeboot fail to find record of preregistered baremetal 2019-03-08 21:36:46 +08:00
ningyu df002545d8 feat: 支持消费总览和账户级别的余额/消费报警 
当不指定Provider和Account_id参数时，为总览级别；当指定Provider和Account_id参数时，即为针对特定云平台和云账号的报警
 2019-03-07 16:08:16 +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
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
周有松 7a1acc9f01 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '5f42063e04d8b23fbae8e995cc691a079d8b8f1c':
  minor fixes
  fix: 1. host start works for baremetal server with guest 2. fix host-syncstatus  3. baremetal may answer pxe request for hypervisors
 2019-03-07 14:42:10 +08:00
周有松 0c089ccafc Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '7a1acc9f0102f8cee20703fa3e36e3efc1ac94bb':
  minor fixes
  fix: 1. host start works for baremetal server with guest 2. fix host-syncstatus  3. baremetal may answer pxe request for hypervisors
 2019-03-07 14:42:10 +08:00
Qiu Jian b8bd9b1fbe fix: 1. host start works for baremetal server with guest 2. fix 
host-syncstatus  3. baremetal may answer pxe request for hypervisors
 2019-03-07 01:52:44 +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 2216f01ab9 zhengjj-add-cloud-sku-rates 2019-03-06 17:39:30 +08:00
zhengjiajie 54acc594c9 zhengjj-add-cloud-sku-rates 2019-03-06 17:31:33 +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
邱剑 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
Qiu Jian ef197ca3d0 improvements: autonomously adjust sync interval according to resources in region 2019-03-05 02:35:20 +08:00
屈轩 31d7f04f82 同步azure项目 2019-03-04 17:48:08 +08:00
屈轩 86f0b91db6 腾讯云加入debug信息 2019-03-04 17:20:57 +08:00
屈轩 10d4ca66c0 init 2019-03-04 16:36:47 +08:00
Qiu Jian abb4181871 skip objects that is undergoing a task 2019-03-04 14:08:15 +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
Zexi Li 20d61c649b climc: kubeclusters check system cluster status 2019-02-28 21:49:35 +08:00
邱剑 f0cc337aa0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'bc9f9089f81025a4c2c20fec9999b58f53767ee6':
  限制endpoint范围
  支持openstack选择对应的endpoint类型
 2019-02-28 20:18:27 +08:00
屈轩 fcfbf69ab2 解决冲突 2019-02-28 20:16:34 +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