Commit Graph
2414 Commits
Author SHA1 Message Date
wanyaoqi 9b7f468186 20181222: storageman interfaces, work manager refactor 2019-01-22 16:56:47 +08:00
wanyaoqi a053e372ef 20181221 temp commit 2019-01-22 16:56:47 +08:00
wanyaoqi 5b16b5b423 20181220: centos guestfs, move utils to cloudcommon 2019-01-22 16:56:47 +08:00
wanyaoqi a3feb6d5b9 temo 2019-01-22 16:56:47 +08:00
Zexi Li 0dc7e2bff6 add server Nic struct 2019-01-22 16:56:47 +08:00
Zexi Li 3baecbb91c * move utils path
* update vendor
2019-01-22 16:56:47 +08:00
Zexi Li c7d0a215f0 baremetal: megactl 2019-01-22 16:56:47 +08:00
Zexi Li 1dd89ffd59 baremetal related api 2019-01-22 16:56:47 +08:00
Zexi Li 07863a7d6f baremetal prepare 2019-01-22 16:56:47 +08:00
Zexi Li f64b7b8e5c - support relay address
- ssh util
- baremetal tasks
2019-01-22 16:56:47 +08:00
Zexi Li 1aa39c54e1 baremetal register 2019-01-22 16:56:47 +08:00
Zexi Li 703b094a60 baremetal init 2019-01-22 16:56:47 +08:00
wanyaoqi b8768291ed temp commit 2019-01-22 16:56:47 +08:00
wanyaoqi fc7a9f3728 2018-12-17 ~ 81-21-8102 2019-01-22 16:56:47 +08:00
wanyaoqi c22561e9f5 temp 2019-01-22 16:56:47 +08:00
wanyaoqi f33a84fba5 2018-12-13 2019-01-22 16:56:47 +08:00
wanyaoqi 3c3a90b550 temp 2019-01-22 16:56:47 +08:00
wanyaoqi 1d2fe321d4 fix code 2019-01-22 16:56:47 +08:00
wanyaoqi 1bb42ae017 20181204-20181205 2019-01-22 16:56:47 +08:00
wanyaoqi cab32944b9 2018-12-04: init commit 2019-01-22 16:56:47 +08:00
邱剑 fe55edd794 Automatic merge from release/2.5.0 -> release/2.6.0
* commit '7934c01e08d9cb85013dfcde2caa7e1bda486488':
  避免project未找到直接返回err
2019-01-22 16:30:35 +08:00
屈轩 b9dd5052ca 冲突解决 2019-01-22 16:29:08 +08:00
邱剑 6f732d1edc Automatic merge from release/2.3.0 -> release/2.4.0
* commit '0aafe01ee8d8934f54b75b1c2366c5dd72857101':
  避免project未找到直接返回err
2019-01-22 16:18:37 +08:00
屈轩 3e4b8fed08 避免project未找到直接返回err 2019-01-22 16:17:10 +08:00
邱剑 562de369a2 Automatic merge from release/2.5.0 -> release/2.6.0
* commit 'f552befc8f28c181ba899d403e9f2cb889abb946':
  fix account confilct
2019-01-22 16:05:42 +08:00
TangBin aec2078552 fix account confilct 2019-01-22 15:51:32 +08:00
Zexi Li 223c6d95a2 修复: webconsole 连接vnc设置 password 的虚拟机 2019-01-19 17:35:59 +08:00
屈轩 6f226e2dfd 补充误删的access_url check 2019-01-19 15:14:50 +08:00
邱剑 bbcea5e8dc Merge pull request #946 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-account to release/2.5.0
* commit 'b16bc5d2cb39d912696f8503dfa3cc638e42fb8d':
  修复openstack项目及用户名顺序颠倒问题
2019-01-19 13:21:19 +08:00
屈轩 b16bc5d2cb 修复openstack项目及用户名顺序颠倒问题 2019-01-19 13:18:47 +08:00
屈轩 a1a0445779 避免传递tenant_id和onecloud api冲突 2019-01-19 12:20:45 +08:00
邱剑 e3ddd6a201 Merge pull request #943 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-eip-more-details to release/2.5.0
* commit '5c55f0633af1a750dbd6e28f6b759991fe3ea467':
  取消重复的region信息
  返回eip账号信息
2019-01-18 17:22:26 +08:00
屈轩 5c55f0633a 取消重复的region信息 2019-01-18 16:26:14 +08:00
屈轩 2c72ca35d3 返回eip账号信息 2019-01-18 16:25:13 +08:00
邱剑 3a47eef858 Merge pull request #942 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/remove-key-index to release/2.5.0
* commit '2b4fac6a8755999b4132bf02e1e0a5b765efe4d9':
  remove key index
2019-01-18 16:03:10 +08:00
屈轩 8f65712632 climc 更新 2019-01-18 10:57:36 +08:00
wanyaoqi 2b4fac6a87 remove key index 2019-01-17 22:07:24 +08:00
屈轩 b68bbef09d 后端对公有云账号密码信息重组 2019-01-17 16:23:00 +08:00
wanyaoqi 9201d7fb99 fix network merge 2019-01-17 11:51:29 +08:00
Qiu Jian 069394b2ad 修正:esxi host名称不使用full domain name 2019-01-16 20:15:43 +08:00
李泽玺 fddab3bf81 Merge pull request #937 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-update-vendor-20190116 to release/2.5.0
* commit '305baf5d5f08b00b5aa744f77d63fb63a42f80f7':
  update vendor
2019-01-16 18:06:58 +08:00
Qiu Jian 305baf5d5f update vendor 2019-01-16 18:04:40 +08:00
邱剑 006c3a20bf Merge pull request #933 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-storage-is-sys-disk-store to release/2.5.0
* commit 'f3b85dcb7bf7b88afa5005c9b402e4564e6b003b':
  修正:storage增加IsSysDiskStore属性,标示是否支持系统盘创建。阿里云cloud存储不支持系统盘创建
2019-01-16 15:33:38 +08:00
邱剑 8d6a2b6527 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '1eec7ce09428572dd748d58f025f4055021fe6e6':
  lb: 改正health_check_{domain,path}校验
2019-01-16 12:35:42 +08:00
邱剑 a4a55be7fd Automatic merge from release/2.4.0 -> release/2.5.0
* commit '8d6a2b6527b41bf17655656c80f0461f033b38e2':
  lb: 改正health_check_{domain,path}校验
2019-01-16 12:35:42 +08:00
Yousong Zhou 82796ed1e5 lb: 改正health_check_{domain,path}校验 2019-01-16 03:53:46 +00:00
Qiu Jian c90d6b1acd make dissociate action idempotennt 2019-01-16 00:55:29 +08:00
Qiu Jian 1287af044f 修正:当eip关联主机无效时,允许删除该eip 2019-01-16 00:48:22 +08:00
Qiu Jian f3b85dcb7b 修正:storage增加IsSysDiskStore属性,标示是否支持系统盘创建。阿里云cloud存储不支持系统盘创建 2019-01-15 22:42:55 +08:00
邱剑 35adcede87 Merge pull request #929 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-exclude-prepaid-fake-storage-from-available-storage-types to release/2.5.0
* commit '7bdaac6882dc34cd8df62e584193cd86ede6cfeb':
  修正:将包年包月资源池的虚拟存储从可用区域的存储列表中排除
2019-01-15 17:11:30 +08:00