opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,932 Commits 30 Branches 714 Tags
ccbebfdafd79e75edf5cb0409cdd35a0d2a2cbee
Commit Graph
65 Commits
Author SHA1 Message Date
Qiu Jian 52ab56fa3f Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 
Conflicts:
	pkg/compute/guestdrivers/aws.go
 2019-03-07 15:22:58 +08:00
周有松 09fe040285 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '921038826d35fc655bc1dac048d9630c29468af3':
  避免deploy任务结束时检查系统盘id与返回的磁盘id不匹配导致任务失败
 2019-03-07 14:47:14 +08:00
屈轩 9185c3c2ac 避免deploy任务结束时检查系统盘id与返回的磁盘id不匹配导致任务失败 2019-03-07 14:44:59 +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
屈轩 2a039a782d 创建openstack磁盘使用默认的zone 2019-03-06 21:16:26 +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 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
屈轩 53137dec29 忽略deny规则 2019-03-05 17:25:25 +08:00
屈轩 ef4e13c668 避免创建vpc后wire同步异常 2019-03-05 16:34:44 +08:00
屈轩 10f66f0bd0 修复套餐系统盘盘大小异常问题 2019-03-05 14:10:02 +08:00
邱剑 fb5adf56c0 Merge pull request #1156 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-external-project to release/2.7.0 
* commit '0ce6b70998e5646b7f1a1f0f610b003132fab980':
  更改ProjectSource -> ProjectSrc
  同步openstack项目
  同步azure项目
  腾讯云加入debug信息
  external_project去掉cloudregion属性
  补充其他资源项目同步
  映射表默认指向provider的project
  init
 2019-03-05 12:12:54 +08:00
屈轩 ba61e5d8f4 同步openstack项目 2019-03-04 18:29:06 +08:00
TangBin 12c1bfb1d6 create instance tips fix && min_ram fix 2019-03-04 18:00:04 +08:00
屈轩 594b542aad external_project去掉cloudregion属性 2019-03-04 16:36:48 +08:00
屈轩 8bd0bc0024 补充其他资源项目同步 2019-03-04 16:36:47 +08:00
屈轩 173034cd26 映射表默认指向provider的project 2019-03-04 16:36:47 +08:00
屈轩 10d4ca66c0 init 2019-03-04 16:36:47 +08:00
Qiu Jian 605cbb2558 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 2019-03-04 01:42:39 +08:00
Qiu Jian 62ebc90f2a feature: allow auto sychrnoization of cloud account 2019-03-04 01:09:34 +08:00
屈轩 7544a3daf1 创建openstack指定对应的主机 2019-03-03 15:02:17 +08:00
屈轩 fa008f4e58 解决冲突 2019-03-03 14:54:48 +08:00
屈轩 dc799abbc9 更改命名方式 2019-03-01 17:45:22 +08:00
屈轩 6063545a07 虚拟zone 2019-03-01 16:41:11 +08:00
屈轩 41404e19b1 获取所有项目 2019-03-01 15:53:55 +08:00
屈轩 7475aa0fb1 避免同步相同的host 2019-03-01 11:40:01 +08:00
屈轩 3ab8beee03 过滤zone底下的host 2019-03-01 11:35:10 +08:00
屈轩 fcfbf69ab2 解决冲突 2019-02-28 20:16:34 +08:00
屈轩 1c8eeb317a 限制endpoint范围 2019-02-28 15:50:55 +08:00
屈轩 e6bfe279a1 支持openstack选择对应的endpoint类型 2019-02-28 15:23:41 +08:00
Qiu Jian 92bfe69de1 fix: unify image.min_disk unit to MB 2019-02-25 17:04:51 +08:00
Qiu Jian e4d1a7a21f fix: build broken for changing GetNetworkOfIP to GetOnPremiseNetworkOfIP 2019-02-21 11:02:37 +08:00
Qiu Jian 6bb72482b9 fix: list managed resources and associate resources with uniform filters 2019-02-19 16:45:09 +08:00
Qiu Jian 78dac22cda Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloudprovider 2019-02-18 23:21:56 +08:00
Qiu Jian d32633dc95 Recode cloudprovider/cloudproviderfactory 2019-02-18 23:10:57 +08:00
邱剑 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
邱剑 23d883ceae Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '274e31d858fb054a0ccda96a65f292df94727740':
  通过provider is_public_cloud区分公有云私有云
 2019-02-18 18:29:46 +08:00
屈轩 2ffe44a383 通过provider is_public_cloud区分公有云私有云 2019-02-18 17:43:31 +08:00
屈轩 b388874335 rebase 2.6.0 2019-02-16 17:44:40 +08:00
屈轩 f2c16bbc48 快照磁盘支持区分公有云私有云 2019-02-16 17:39:42 +08:00
屈轩 27ce557a57 openstack 同步flavor 2019-02-16 17:38:30 +08:00
屈轩 d85e2f8162 openstack创建 2019-02-16 17:37:33 +08:00
Qiu Jian 0ad4c22879 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190213 
Conflicts:
	pkg/compute/tasks/cloud_provider_sync_info_task.go
 2019-02-13 12:12:19 +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
Qiu Jian 77b95af988 feature: 
1. change SERVER_TYPE_* to NETWORK_TYpE_*
2. add NETWORK_TYPE_PXE and NETWORK_TYPE_IPMI specifically for baremetal PXE and IPMI
network allocation
 2019-01-29 23:38:15 +08:00
万垚奇 28c0452851 Merge pull request #984 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/host-baremetal-v2 to release/2.6.0 
* commit '06446f778364e97cd2df66d8ed40f3c0c4d6574e': (135 commits)
  baremetal: ipmitool passowrd EscapeEchoString
  add hostmetrics
  add hostmetrics
  types struct 符合命名规范
  修正：centos 7宿主机格式化的ext4和xfs能够被centos 6虚拟机挂载
  add bsd raw socket code
  fix code
  fix code
  dep add gopsutil/mem
  fix dhcp server
  baremetal: quit signal handle
  baremetal: quit signal handle
  fix dhcp server
  gendoc
  remove jsonutils NewPair
  fix qmp montior cmd
  snapshot recycle, disk recycle, dhcp relay use raw socket
  fix code, test migrate snapshot, fix deploy
  add migrate presend arp
  add ethernet pkg
  ...
 2019-01-28 20:04:24 +08:00
屈轩 c1e450f38c 解决冲突 2019-01-26 18:47:47 +08:00
屈轩 881ed73ce5 修复opentack同步的问题 2019-01-26 16:45:37 +08:00
周有松 5562e8a528 Merge pull request #939 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-lb-create to release/2.6.0 
* commit '409b376ebdd13086d2a5a7462ab076827dff0f25':
  修正udp,tcp后端服务器组id异常
  添加监听同步配置操作
  统一LoadBalancer函数大小写问题
  添加region driver
 2019-01-26 15:57:03 +08:00
屈轩 dc81eb1d5e 统一LoadBalancer函数大小写问题 2019-01-25 14:57:57 +08:00