邱剑
2310be389b
Automatic merge from release/2.7.0 -> release/2.8.0
...
* commit '430df17dd3cefe0f25328ce69bf8d8b0d0e95253':
fix: SyncOnce should invalidate policy cache
fix: refine policy match conditions
minor updates
fix: simplify rbac policy condition to match projects and roles
2019-03-21 11:31:11 +08:00
邱剑
430df17dd3
Automatic merge from release/2.6.0 -> release/2.7.0
...
* commit '07304221c0e4f4fa1f75438d24a8feece7202c9f':
fix: SyncOnce should invalidate policy cache
fix: refine policy match conditions
minor updates
fix: simplify rbac policy condition to match projects and roles
2019-03-21 11:31:11 +08:00
Qiu Jian
06ae94ebe3
fix: simplify rbac policy condition to match projects and roles
2019-03-21 01:03:51 +08:00
Zexi Li
6df6880501
define scheduler apis output and input structs
2019-03-20 12:03:29 +08:00
Zexi Li
19c341c297
scheduler: use compute models
2019-03-20 12:03:29 +08:00
Zexi Li
a81ee45f4a
region: support cloudregion capabilities
2019-03-19 21:03:06 +08:00
邱剑
116067b02a
Merge pull request #1223 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-tag to release/2.8.0
...
* commit '43daa1ceb420d8b6176e92ee7c023d51c9c8e962':
用户自定义标签加前缀user:
同步公有云key加上前缀
限制key必须是中英文、数字或者_
允许只传key进行过滤
取消key以_开头key限制
metadata返回列表使用复数
支持server disk 过滤
支持标签
2019-03-19 15:59:46 +08:00
屈轩
43daa1ceb4
用户自定义标签加前缀user:
2019-03-19 11:26:33 +08:00
邱剑
7d1d851244
Merge pull request #1255 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/fix-package-dependence to release/2.8.0
...
* commit '53ece34f3b424d4430b1198ea06a66456a4a9a12':
merge const pkg from cloudcommon to compute
fix package dependence
2019-03-18 17:18:35 +08:00
邱剑
5fc8909a84
Merge pull request #1267 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-vipkid-aws-access-tools to release/2.8.0
...
* commit 'bd94daec0ca83069d376e6ca1f5e10a4e4ac72b6':
minor updates
feature: cloudaccount add options field to store additional options, such billing_report_bucket for AWS and balance_key for Azure
feature: add cryptool for convenience
2019-03-18 09:02:51 +08:00
邱剑
ad8e990f61
Automatic merge from release/2.7.0 -> release/2.8.0
...
* commit '0c2efb51a141bb65541ed66b8b670d94093dd3d4':
lbagent: try using unicast vrrp
lbagent: report ip, ha_state, version
lbagent: always reload on startup
lbagent: making agent params with reflect
netutils2: add MyIP() for finding default source ip
2019-03-17 11:42:29 +08:00
Yousong Zhou
4f7a4177ac
Merge remote-tracking branch 'origin/release/2.6.0' into feature/yousong-lbagent-managed
2019-03-17 02:35:09 +00:00
Qiu Jian
b7d5746197
feature: cloudaccount add options field to store additional options,
...
such billing_report_bucket for AWS and balance_key for Azure
2019-03-16 20:24:24 +08:00
Yousong Zhou
33f568717b
lbagent: report ip, ha_state, version
2019-03-15 12:11:22 +00:00
wanyaoqi
e0ee2b8c59
fix package dependence
2019-03-15 11:45:56 +08:00
邱剑
5cbc5e3566
Automatic merge from release/2.7.0 -> release/2.8.0
...
* commit 'd37fecd3cc3d4d1382930c71d33cae80498089f3':
fix: qcloud startVM do not retry implicitly
minor fixes
make capabilities optional
not allow to delete cloud-account and provider when auto sync enabled
minor fixes
fix: cleanup project sync codes
2019-03-15 09:54:37 +08:00
屈轩
2d0cc14835
支持server disk 过滤
2019-03-14 15:43:21 +08:00
屈轩
703ce13f67
支持标签
2019-03-14 15:42:46 +08:00
Qiu Jian
f2f8cbb388
feature: add cryptool for convenience
2019-03-14 13:17:32 +08:00
Qiu Jian
6e8e415235
Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloud-account-create-options
2019-03-14 12:11:54 +08:00
Qiu Jian
e74f31b7c0
fix: cleanup project sync codes
2019-03-14 09:46:29 +08: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
邱剑
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
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
邱剑
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
邱剑