Commit Graph
9 Commits
Author SHA1 Message Date
邱剑 e9e2dbaea1 Merge pull request #1024 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-oepnstack-stage2 to release/2.6.0
* commit 'f5f2addfd7ea634e598293a37879c251b9eea006':
  避免部署主机失败后未设置external_id而删除主机失败
  rebase 2.6.0
  快照磁盘支持区分公有云私有云
  openstack 同步flavor
  openstack创建
2019-02-18 23:02:49 +08:00
屈轩 2ffe44a383 通过provider is_public_cloud区分公有云私有云 2019-02-18 17:43:31 +08:00
屈轩 27ce557a57 openstack 同步flavor 2019-02-16 17:38:30 +08:00
Qiu Jian 6fccbfcd6e Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.5.0-20190213
Conflicts:
	pkg/compute/models/guests.go
	pkg/compute/service/service.go
	pkg/compute/tasks/cloud_provider_sync_info_task.go
2019-02-13 12:01:01 +08:00
屈轩 b16bc5d2cb 修复openstack项目及用户名顺序颠倒问题 2019-01-19 13:18:47 +08:00
屈轩 8f65712632 climc 更新 2019-01-18 10:57:36 +08:00
屈轩 b68bbef09d 后端对公有云账号密码信息重组 2019-01-17 16:23:00 +08:00
屈轩 935cd5dcac 优先使用hypervisor接口 2019-01-02 17:38:59 +08:00
屈轩 81dc4a0a47 补充openstack v3认证信息 2019-01-02 17:32:38 +08:00