wanyaoqi
fcd4fd62e2
fix disk resize
2019-03-13 21:10:57 +08: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
邱剑
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
邱剑
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
周有松
541480349b
Automatic merge from release/2.7.0 -> release/2.8.0
...
* commit '9f5283c11e73656f407bdc310b5411e024572419':
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:40:14 +08:00
Qiu Jian
4e9eab8ee7
Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190313-2.7.0
...
Conflicts:
pkg/cloudcommon/db/taskman/tasks.go
2019-03-13 16:32:18 +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
Qiu Jian
64bb1b15db
fix: use agent manageruri instance of endpoint to visit agents
2019-03-13 11:52:10 +08:00
邱剑
b9a5b2a431
Merge pull request #1221 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.8.0
...
* commit '1d87a1ffc5ed7533e0745e32073e2e06a0378334':
fix code, fix bug resize disk
fix deploy with iso error
support nfs storage
2019-03-13 10:33:20 +08:00
Qiu Jian
533a629dd4
make fmt
2019-03-13 01:47:28 +08:00
Qiu Jian
300f4e5163
fix: recode cloud-account-create commands, easier to use
2019-03-13 01:42:07 +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
wanyaoqi
1d87a1ffc5
fix code, fix bug resize disk
2019-03-12 17:46:13 +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
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
wanyaoqi
95da368f36
support nfs storage
2019-03-12 12:46:55 +08:00
Yousong Zhou
8016a27abf
lbagent: telegraf: add params influx_db_output_unsafe_ssl
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
周有松
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
邱剑
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
屈轩
f981e2162e
冲突解决
2019-03-11 18:19:53 +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
邱剑
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
邱剑
8eba27de32
Automatic merge from release/2.6.0 -> release/2.7.0
...
* commit '3fd8e9926049285dafaa0ae4d210389cce54e644':
如果挂载磁盘失败, 记录失败日志
2019-03-11 17:06:57 +08:00
屈轩
bf3546109c
跟随主机创建的磁盘默认都是auto delete
2019-03-11 16:09:49 +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
2552c658c4
fix: recode host.getWiresOfId
2019-03-11 14:32:36 +08:00
Qiu Jian
621ac5f6af
Make minimal sysdisk size to 10G
2019-03-11 09:48:00 +08:00
Qiu Jian
7bdab6e02d
feature: nic bonding/teaming support on region
2019-03-11 04:45:34 +08:00
周有松
332bf1e9e5
Merge pull request #1202 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-allow-auto-sync-account-in-stale-syncing-state to release/2.7.0
...
* commit 'b485f31e81c5fdffd6006ec85891e84ef936186a':
fix: try to sync disconnected account for every 24 hours
fix: cloudaccount that is in stale syncing status should be auto-synced
2019-03-10 15:34:26 +08:00
Qiu Jian
b485f31e81
fix: try to sync disconnected account for every 24 hours
2019-03-09 20:14:16 +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
Qiu Jian
13d8ba02a5
fix: cloudaccount that is in stale syncing status should be auto-synced
2019-03-08 23:22:46 +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
周有松
6ad0de9608
Merge pull request #1190 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-sync-with-lock to release/2.7.0
...
* commit '9d5ef350fca63e1bf8544531973be0494076b3d2':
fix: to make it consistent, change cloudproviderregion auto_sync to enable_auto_sync
2019-03-08 17:41:34 +08:00
屈轩
079e39def0
如果挂载磁盘失败, 记录失败日志
2019-03-08 16:46:21 +08:00
邱剑
ba5606dd30
Merge pull request #1189 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-msyd-20190307 to release/2.6.0
...
* commit '76bab2c693c6fc6f8dd4939a1469a4914edc10d4':
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-08 10:27:28 +08:00
Qiu Jian
d23414f3f6
fix: validate host status before doing renew prepaid recycle
2019-03-08 00:01:14 +08:00
Qiu Jian
98565a815b
fix: allow host attach to same wire with multiple interface
2019-03-07 22:37:17 +08:00
Qiu Jian
9d5ef350fc
fix: to make it consistent, change cloudproviderregion auto_sync to
...
enable_auto_sync
2019-03-07 22:35:30 +08:00
万垚奇
e0db43c890
Merge pull request #1172 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/cpu-mem-wyq/hotplug to release/2.7.0
...
* commit '7c39255ef75158324e597b096a596f02c36fad48':
add hotplug check
2019-03-07 17:50:29 +08:00