wanyaoqi
389d64d92b
guest do not sync status on guest delete
2019-03-15 15:49:53 +08:00
邱剑
d37160a90f
Merge pull request #1246 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/fix-capabilities to release/2.6.0
...
* commit 'f3554fe30f3b1fe30a1ea832190f7d2d4747a384':
make capabilities optional
2019-03-14 23:12:41 +08:00
邱剑
0205a6fc4a
Automatic merge from release/2.5.0 -> release/2.6.0
...
* commit '268866f8a23c8b8ec353406f7c5cdb55fd966cfb':
腾讯云续费实例没有ClientToken参数
2019-03-14 18:28:41 +08:00
邱剑
268866f8a2
Automatic merge from release/2.4.0 -> release/2.5.0
...
* commit 'ffb25c7121c513a7e610433dd90a4345998609a1':
腾讯云续费实例没有ClientToken参数
2019-03-14 18:28:41 +08:00
周有松
b161f5af44
Merge pull request #1234 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-renew-instance to release/2.6.0
...
* commit '5624a294daf9b9fb85d76c5523b7fed939accfbf':
optimize huawei renew
wait huawei instance renew sucess
huawei instance renew bugfix
2019-03-14 17:45:25 +08:00
屈轩
8dde1cae02
腾讯云续费实例没有ClientToken参数
2019-03-14 16:55:32 +08:00
邱剑
3c8d6a7337
Merge pull request #1248 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-conflicts-fix-release2.6.0-314 to release/2.6.0
...
* commit '9464f71ed2a609398c71897e9649108bdaeda382':
add skus util function test
soldout skus fix & add more comment
2019-03-14 15:38:20 +08:00
TangBin
9464f71ed2
fix conflicts
2019-03-14 12:33:53 +08:00
wanyaoqi
f3554fe30f
make capabilities optional
2019-03-14 12:13:37 +08:00
TangBin
5624a294da
optimize huawei renew
2019-03-14 11:05:37 +08:00
TangBin
173098a998
fix conflicts
2019-03-14 10:53:52 +08:00
Yousong Zhou
098d62bdc5
treewide: 改进opslog记录update diff
...
action为ACT_UPDATE,仅当len(UpdateDiffs) > 0时才记录
2019-03-13 14:20:54 +00:00
邱剑
223c9f6461
Merge pull request #1224 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-goimports to release/2.6.0
...
* commit '8fe4f2ec98110dece5412f7980a0085725b7e993':
treewide: group imports with goimports
2019-03-13 21:01:20 +08:00
邱剑
df6bc80c89
Merge pull request #1228 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-disk-resize-backport-from-2.8 to release/2.6.0
...
* commit '2d863896854beee27168f5dd2f00aafb9dbe1131':
fix disk resize
2019-03-13 20:56:16 +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
邱剑
4cf5c87a5a
Merge pull request #1229 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-use-agent-manageruri-to-visit-agent to release/2.6.0
...
* commit '64bb1b15db4e6ff7c5afb10059b6bdcbf7b54c10':
fix: use agent manageruri instance of endpoint to visit agents
2019-03-13 17:39:09 +08:00
TangBin
caf6540e61
wait huawei instance renew sucess
2019-03-13 16:55:01 +08:00
邱剑
9448fde22d
Merge pull request #1222 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-msyd-bugfix-20190312 to release/2.6.0
...
* commit '1ca00c14c6d0e3e9342f8e2a0a5586f6b2fc7a2c':
fix: find image peer host with local storage only
fix: filter cached images by storage status
remove debug logs
fix: usage port state not correct
fix: 1. usage hide system servers 2. host undo convert shows wrong status
2019-03-13 16:28:32 +08:00
TangBin
ebe6e378e1
huawei instance renew bugfix
2019-03-13 15:51:21 +08:00
TangBin
a32ddd4364
add skus util function test
2019-03-13 15:33:11 +08:00
TangBin
d9baf4c462
soldout skus fix & add more comment
2019-03-13 12:09:59 +08:00
Qiu Jian
64bb1b15db
fix: use agent manageruri instance of endpoint to visit agents
2019-03-13 11:52:10 +08:00
wanyaoqi
2d86389685
fix disk resize
2019-03-13 11:42:06 +08:00
Qiu Jian
7e606b64d3
fix: cherry-pick hotfix/qj-recover-image-properties-at-startup
2019-03-13 10:31:44 +08:00
Qiu Jian
1ca00c14c6
fix: find image peer host with local storage only
2019-03-12 21:48:40 +08:00
Qiu Jian
cb9fea2286
fix: filter cached images by storage status
2019-03-12 18:24:12 +08:00
Qiu Jian
8b460aa21f
remove debug logs
2019-03-12 15:11:27 +08:00
Qiu Jian
4e85b1cd5a
fix: usage port state not correct
2019-03-12 15:07:13 +08:00
Qiu Jian
f7c61a9750
fix: 1. usage hide system servers 2. host undo convert shows wrong
...
status
2019-03-12 13:39:22 +08:00
Yousong Zhou
4b4c86b883
lbagent: fix corpus versioning
2019-03-12 03:39:20 +00:00
Yousong Zhou
fef63230ac
mcclient: options: ignore ID when converting to params
2019-03-12 03:39:20 +00:00
Yousong Zhou
8016a27abf
lbagent: telegraf: add params influx_db_output_unsafe_ssl
2019-03-12 03:39:20 +00:00
Yousong Zhou
c6648ed0da
mcclient: lbagent: allow setting telegraf config template
2019-03-12 03:39:20 +00:00
Yousong Zhou
c6e4fff0d0
lb: 不记录来自lbagent的GET查询请求
...
要求
- _orig=lbagent
- userCred.HasSystemAdminPrivilege()
2019-03-12 03:39:20 +00:00
Yousong Zhou
07f98779ad
treewide: s/HasSystemAdminPrivelege/HasSystemAdminPrivilege/g
2019-03-12 03:39:20 +00:00
Qiu Jian
61a0164f72
fix: image list show mindisk field
2019-03-11 21:41:23 +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
邱剑
99e2c939a5
Automatic merge from release/2.5.0 -> release/2.6.0
...
* commit '8dacd50d0e7c995d7d4927f3c90a54046d1e52a8':
修复2.5未自动合并2.4代码更改
2019-03-11 18:28:42 +08:00
屈轩
aea7a72abe
修复2.5未自动合并2.4代码更改
2019-03-11 18:27:08 +08:00
邱剑
39af7f16b5
Automatic merge from release/2.5.0 -> release/2.6.0
...
* commit 'a291bd687813f494073e480f0c19cc63058c63fa':
跟随主机创建的磁盘默认都是auto delete
2019-03-11 18:14:17 +08:00
邱剑
a291bd6878
Automatic merge from release/2.4.0 -> release/2.5.0
...
* commit '7ee3f025ae382b2ca0e7113e50ffffdf33693400':
跟随主机创建的磁盘默认都是auto delete
2019-03-11 18:14:17 +08:00
邱剑
6ec6b2cf6c
Merge pull request #1214 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-conflict-k to release/2.6.0
...
* commit 'c5d7189b1b7e6ecf9a3ed85191f65b1e731dc94c':
尽可能的同步openstack host信息
2019-03-11 18:09:30 +08:00
邱剑
041d79c959
Merge pull request #1196 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-prepaid-guest-renew to release/2.6.0
...
* commit '12cd111af41b15a67cb471234d1df19310126468':
huawei renew bugfix
add auto renew consts
add huawei renew isntance
2019-03-11 18:09:08 +08:00
屈轩
c5d7189b1b
冲突解决
2019-03-11 17:56:55 +08:00
TangBin
12cd111af4
huawei renew bugfix
2019-03-11 17:54:28 +08:00
邱剑
c80ebefaca
Merge pull request #1194 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-flavor to release/2.6.0
...
* commit 'cc6aff8743e5d0bfc7223e3c9c25b04bcb2f4917':
openstack: 不创建flavor,仅查找合适的套餐
避免创建flavor时重名
2019-03-11 17:24:12 +08:00
邱剑
9024bfe508
Merge pull request #1199 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-rbd-storage-simple to release/2.6.0
...
* commit 'fccb9218fc56d6d230469e4d5f6bd99bc7294ff0':
优化命令结构
优化获取ceph storage存储大小方式
2019-03-11 17:22:25 +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
邱剑
3fd8e99260
Merge pull request #1195 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-storage-attach-log to release/2.6.0
...
* commit '079e39def02adb336dc52390bae61c5f64e81c3d':
如果挂载磁盘失败, 记录失败日志
2019-03-11 17:06:57 +08:00