Commit Graph

22 Commits

Author SHA1 Message Date
ioito
98c4a12093 merge master 2019-05-22 21:51:21 +08:00
ioito
d0f2882064 OpenStack支持EIP 2019-05-22 21:43:05 +08:00
Qiu Jian
004d9b6f95 update copyright headers of all source 2019-03-29 14:47:48 +08:00
邱剑
22e227989e Automatic merge from release/2.6.0 -> release/2.7.0
* commit '3906a745866a5c3035112f1b0a845c075e8a583a':
  openstackcli:修复参数缺失bug
2019-03-25 19:40:27 +08:00
屈轩
e9d53e0c59 openstackcli:修复参数缺失bug 2019-03-25 17:47:33 +08:00
邱剑
85019a73c6 Automatic merge from release/2.6.0 -> release/2.7.0
* commit 'ce4f64a1fc2bca608f449762a2441591e8a8a36d':
  openstack:避免因disk没有设置volume_type而导致同步磁盘数据不全
  避免因openstack版本低导致不能设置系统盘storage_type导致部署失败
2019-03-23 18:00:34 +08:00
屈轩
1dc5c516c0 避免因openstack版本低导致不能设置系统盘storage_type导致部署失败 2019-03-23 15:58:58 +08:00
邱剑
da39961b19 Automatic merge from release/2.6.0 -> release/2.7.0
* commit 'c80ebefaca1e5c7a6018465e99e6f5b8abfd0cd9':
  openstack: 不创建flavor,仅查找合适的套餐
  避免创建flavor时重名
2019-03-11 17:24:13 +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
邱剑
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
屈轩
dd286d6b7e 修复k版openstack不支持id=in:参数 2019-03-09 13:26:06 +08:00
屈轩
bddf33140a 避免创建flavor时重名 2019-03-08 12:39:47 +08:00
屈轩
ba61e5d8f4 同步openstack项目 2019-03-04 18:29:06 +08:00
屈轩
fa008f4e58 解决冲突 2019-03-03 14:54:48 +08:00
屈轩
6063545a07 虚拟zone 2019-03-01 16:41:11 +08:00
Qiu Jian
e4d1a7a21f fix: build broken for changing GetNetworkOfIP to GetOnPremiseNetworkOfIP 2019-02-21 11:02:37 +08:00
屈轩
27ce557a57 openstack 同步flavor 2019-02-16 17:38:30 +08:00
屈轩
d85e2f8162 openstack创建 2019-02-16 17:37:33 +08:00
屈轩
adb95b27df 更新vendor 2019-01-02 17:38:59 +08:00
屈轩
935cd5dcac 优先使用hypervisor接口 2019-01-02 17:38:59 +08:00
屈轩
54e3e2fba2 获取openstack compute api version 2019-01-02 17:37:51 +08:00
屈轩
81dc4a0a47 补充openstack v3认证信息 2019-01-02 17:32:38 +08:00