屈轩
9185c3c2ac
避免deploy任务结束时检查系统盘id与返回的磁盘id不匹配导致任务失败
2019-03-07 14:44:59 +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
周有松
5f42063e04
Merge pull request #1176 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-start-misc-20190327 to release/2.6.0
...
* commit '6aaa82b7c3c44cfb98870c488670feee2e175839':
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:09 +08:00
周有松
327145d173
Automatic merge from release/2.6.0 -> release/2.7.0
...
* commit '2ae7c3e5c35a2181020baaa308f06cbc703090db':
disk GB fix && make fmt
2019-03-07 14:41:48 +08:00
周有松
a5397cf7f7
Automatic merge from release/2.7.0 -> release/2.8.0
...
* commit '327145d173fc1e82cf809872328db3d1687799eb':
disk GB fix && make fmt
2019-03-07 14:41:48 +08:00
周有松
91b45841be
Automatic merge from release/2.7.0 -> release/2.8.0
...
* commit 'f84b75977e4d7c3f5830700922c498d84c4d8ca0':
过滤掉不支持的huawei skus & image
imagetools add RHEL dist
统一aws登录用户名
统一aliyun登录用户名
使用公有云镜像时,正确设置登录用户名
2019-03-07 14:41:34 +08:00
周有松
f84b75977e
Merge pull request #1177 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-conflicts-fix-2.7.0 to release/2.7.0
...
* commit '8009f714d4a39c5fbbabc5a059b103479856b851':
过滤掉不支持的huawei skus & image
imagetools add RHEL dist
统一aws登录用户名
统一aliyun登录用户名
使用公有云镜像时,正确设置登录用户名
2019-03-07 14:41:33 +08:00
TangBin
e6f4186236
disk GB fix && make fmt
2019-03-07 14:28:21 +08:00
Qiu Jian
3d1ba16f95
fix: exi host name conversion remove ip
2019-03-07 11:13:58 +08:00
TangBin
8009f714d4
Merge branch 'release/2.6.0' of ssh://git.yunion.io/~tangbin/onecloud into release/2.7.0
2019-03-07 11:08:37 +08:00
周有松
d1511914a9
Merge pull request #1157 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-username to release/2.6.0
...
* commit 'e74d3f61cbe960c087a43c6fe2184b700609838d':
imagetools add RHEL dist
统一aws登录用户名
统一aliyun登录用户名
使用公有云镜像时,正确设置登录用户名
2019-03-07 10:55:33 +08:00
Qiu Jian
6aaa82b7c3
minor fixes
2019-03-07 01:56:23 +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
邱剑
9339bee71c
Merge pull request #1173 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-image-list-fix to release/2.6.0
...
* commit '0bb016d4431c937da79a788f6977ffd47d718aa7':
过滤掉不支持的huawei skus & image
2019-03-06 23:55:01 +08:00
邱剑
ee523fd312
Automatic merge from release/2.7.0 -> release/2.8.0
...
* commit '09837a31a04d9937e72a8bf29c3ef9431655f79a':
创建openstack磁盘使用默认的zone
2019-03-06 23:47:30 +08:00
邱剑
09837a31a0
Automatic merge from release/2.6.0 -> release/2.7.0
...
* commit 'd8ffe73d588b61f1011d3b3356127d0464c272b2':
创建openstack磁盘使用默认的zone
2019-03-06 23:47:30 +08:00
邱剑
d8ffe73d58
Merge pull request #1174 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-disk-create to release/2.6.0
...
* commit '2a039a782d9a6cd2ce3d346d5502755edbd363b7':
创建openstack磁盘使用默认的zone
2019-03-06 23:47:29 +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
邱剑
dc2e48f9d3
Automatic merge from release/2.6.0 -> release/2.7.0
...
* commit '089040d61a959c8cd3ba6b0cfea2cd3c35399338':
fix: umount rootfs before zerofree the partition
2019-03-06 23:21:52 +08:00
邱剑
089040d61a
Merge pull request #1171 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-unount-rootfs-before-zerofree to release/2.6.0
...
* commit 'aee2a608836b23b329e58947eb80d69117c47f7f':
fix: umount rootfs before zerofree the partition
2019-03-06 23:21:51 +08:00
wanyaoqi
7c39255ef7
add hotplug check
2019-03-06 21:32:43 +08:00
屈轩
2a039a782d
创建openstack磁盘使用默认的zone
2019-03-06 21:16:26 +08:00
TangBin
0bb016d443
过滤掉不支持的huawei skus & image
2019-03-06 21:10:26 +08:00
Qiu Jian
aee2a60883
fix: umount rootfs before zerofree the partition
2019-03-06 20:19:40 +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
1efbd1e89c
Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock
2019-03-06 16:58:35 +08:00
张东亮
0bd1864fdb
Automatic merge from release/2.6.0 -> release/2.7.0
...
* commit '02d4b287d0b96d43fd64ab2b5502808b685d990f':
fix: check storage space limit for on-premise cloud only
2019-03-06 10:15:04 +08:00
Qiu Jian
8697124104
fix: check storage space limit for on-premise cloud only
2019-03-06 10:12:24 +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
203d837301
conditional compilation: compile rbd on linux only
2019-03-06 01:06:36 +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
邱剑
c81051124d
Automatic merge from release/2.6.0 -> release/2.7.0
...
* commit '65188bd7c267f3c76aa84003148ebd7b959dd564':
忽略deny规则
避免创建vpc后wire同步异常
openstack重置密码不需要重启机器
修复套餐系统盘盘大小异常问题
2019-03-05 23:14:45 +08:00
邱剑
65188bd7c2
Merge pull request #1165 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-flavor to release/2.6.0
...
* commit '53137dec29f6db7d1cf540dc8ed611e480d1b1f0':
忽略deny规则
避免创建vpc后wire同步异常
openstack重置密码不需要重启机器
修复套餐系统盘盘大小异常问题
2019-03-05 23:14:45 +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
邱剑
f59ab15821
Merge pull request #1159 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.6.0
...
* commit 'f2df8b4816ac87a4c456c40c0d7123cceac5648a':
fix adminCredential is nil
set baremetal dhcp listen address
- procutils: default setsid
add verify server
2019-03-05 23:12:36 +08:00
邱剑
76a2d5b949
Automatic merge from release/2.6.0 -> release/2.7.0
...
* commit 'f59ab15821908b80822b12629dc2cab6dd19861e':
fix adminCredential is nil
set baremetal dhcp listen address
- procutils: default setsid
add verify server
2019-03-05 23:12:36 +08:00
邱剑
a504ede86f
Merge pull request #1166 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-disk-delete-fix to release/2.6.0
...
* commit '9772b3584b7f680b6a70ccea8dca02b2a725921d':
huawei add more region location info
huawei disk delete bugfix
eip short desc add ip_addr & guest delete fix
2019-03-05 20:20:59 +08:00
邱剑
126e5614fc
Automatic merge from release/2.6.0 -> release/2.7.0
...
* commit 'a504ede86f3ce4d587bdf23e9445a5bbe9cc94b1':
huawei add more region location info
huawei disk delete bugfix
eip short desc add ip_addr & guest delete fix
2019-03-05 20:20:59 +08:00
Rex Zhang
e74d3f61cb
imagetools add RHEL dist
2019-03-05 20:04:30 +08:00
Rex Zhang
b0d785b622
统一aws登录用户名
2019-03-05 19:18:32 +08:00
TangBin
9772b3584b
huawei add more region location info
2019-03-05 17:55:06 +08:00
邱剑
b7fe64bd69
Merge pull request #1167 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-add-sku-list-query-condition to release/2.7.0
...
* commit '9b5ca1f5a8f975372c6f890026c20aa29dc7a9fd':
skus query bugfix
2019-03-05 17:28:51 +08:00
屈轩
53137dec29
忽略deny规则
2019-03-05 17:25:25 +08:00
TangBin
9b5ca1f5a8
skus query bugfix
2019-03-05 17:21:40 +08:00
屈轩
ef4e13c668
避免创建vpc后wire同步异常
2019-03-05 16:34:44 +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
99fbe5575d
getNameAndExtId fix
2019-03-05 16:28:56 +08:00