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
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
周有松 6c2c17769d Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '734a9d47314cac9951090f858170c77771ebd6b2':
  fix: zone add filter by host
 2019-03-11 20:24:29 +08:00
周有松 734a9d4731 Merge pull request #1218 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-zone-add-host-filter to release/2.6.0 
* commit 'ce96f911919ca26bf6d91027f5335102c38ee8d9':
  fix: zone add filter by host
 2019-03-11 20:24:29 +08:00
Qiu Jian ce96f91191 fix: zone add filter by host 2019-03-11 20:22:47 +08:00
邱剑 99e2c939a5 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '8dacd50d0e7c995d7d4927f3c90a54046d1e52a8':
  修复2.5未自动合并2.4代码更改
 2019-03-11 18:28:42 +08:00
屈轩 aea7a72abe 修复2.5未自动合并2.4代码更改 2019-03-11 18:27:08 +08:00
邱剑 5d87f8dd76 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '2eaaa80fef6ad9cabf0c1a5a8071751519de18fc':
  跟随主机创建的磁盘默认都是auto delete
 2019-03-11 18:21:03 +08:00
屈轩 f981e2162e 冲突解决 2019-03-11 18:19:53 +08:00
邱剑 39af7f16b5 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'a291bd687813f494073e480f0c19cc63058c63fa':
  跟随主机创建的磁盘默认都是auto delete
 2019-03-11 18:14:17 +08:00
邱剑 a291bd6878 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '7ee3f025ae382b2ca0e7113e50ffffdf33693400':
  跟随主机创建的磁盘默认都是auto delete
 2019-03-11 18:14:17 +08:00
邱剑 3fcf5ca268 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '56c606f9c15d06ff2ae8a023d51ce6de50f31296':
  尽可能的同步openstack host信息
 2019-03-11 18:09:31 +08:00
邱剑 56c606f9c1 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '6ec6b2cf6c7db754713629f5d163ca4fd4b58dcd':
  尽可能的同步openstack host信息
 2019-03-11 18:09:30 +08:00
邱剑 6ec6b2cf6c Merge pull request #1214 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-conflict-k to release/2.6.0 
* commit 'c5d7189b1b7e6ecf9a3ed85191f65b1e731dc94c':
  尽可能的同步openstack host信息
 2019-03-11 18:09:30 +08:00
邱剑 96e86a7f63 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '11cf531be3884224a99fbf882fc570741545705e':
  huawei renew bugfix
  add auto renew consts
  add huawei renew isntance
 2019-03-11 18:09:08 +08:00
邱剑 11cf531be3 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '041d79c95980cff522588b332080a22793b77f11':
  huawei renew bugfix
  add auto renew consts
  add huawei renew isntance
 2019-03-11 18:09:08 +08:00
邱剑 041d79c959 Merge pull request #1196 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-prepaid-guest-renew to release/2.6.0 
* commit '12cd111af41b15a67cb471234d1df19310126468':
  huawei renew bugfix
  add auto renew consts
  add huawei renew isntance
 2019-03-11 18:09:08 +08:00
屈轩 c5d7189b1b 冲突解决 2019-03-11 17:56:55 +08:00
TangBin 12cd111af4 huawei renew bugfix 2019-03-11 17:54:28 +08:00
wanyaoqi 3f8e3988da fix dhcp server 2019-03-11 17:51:51 +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
邱剑 739c8d2c33 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'da39961b19384ce51480da6f1f084fdc0ed460d3':
  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
邱剑 6ab5a7b885 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '9024bfe508c3edaa048ae8b36c735d8fb765f1cc':
  优化命令结构
  优化获取ceph storage存储大小方式
 2019-03-11 17:22:25 +08:00
邱剑 14fc7eb8aa Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '6ab5a7b885b75737f5906a4ae5e484c73c28f2df':
  优化命令结构
  优化获取ceph storage存储大小方式
 2019-03-11 17:22:25 +08:00
邱剑 9024bfe508 Merge pull request #1199 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-rbd-storage-simple to release/2.6.0 
* commit 'fccb9218fc56d6d230469e4d5f6bd99bc7294ff0':
  优化命令结构
  优化获取ceph storage存储大小方式
 2019-03-11 17:22:25 +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
邱剑 a85b5da6f6 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '50550c42e0b7f602837b685f5f75ac32f440e7c5':
  openstack忽略已存在的安全组规则创建错误
  修复k版openstack不支持id=in:参数
 2019-03-11 17:20:46 +08:00
邱剑 4a655258ca Merge pull request #1203 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-image-kilo to release/2.6.0 
* commit '12b8a66358a9f53cb565da165111f299ab53c665':
  openstack忽略已存在的安全组规则创建错误
  修复k版openstack不支持id=in:参数
 2019-03-11 17:20:45 +08:00
邱剑 3fd8e99260 Merge pull request #1195 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-storage-attach-log to release/2.6.0 
* commit '079e39def02adb336dc52390bae61c5f64e81c3d':
  如果挂载磁盘失败, 记录失败日志
 2019-03-11 17:06:57 +08:00
邱剑 8eba27de32 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '3fd8e9926049285dafaa0ae4d210389cce54e644':
  如果挂载磁盘失败, 记录失败日志
 2019-03-11 17:06:57 +08:00
邱剑 4f3671e539 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '8eba27de3243a70be60e8b1823cad8ea9b11f19a':
  如果挂载磁盘失败, 记录失败日志
 2019-03-11 17:06:57 +08:00
屈轩 bf3546109c 跟随主机创建的磁盘默认都是auto delete 2019-03-11 16:09:49 +08:00
邱剑 ac88ff6869 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '4d0ff01a858313bd74ef6cc030b3bcdd7c0c1238':
  fix: recode host.getWiresOfId
  Make minimal sysdisk size to 10G
  fix: RHEL fsdirver fail to deploy networking scripts
  feature: nic bonding/teaming support on region
  feature: nic binding support
 2019-03-11 15:26:52 +08:00
Qiu Jian 8815193f33 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190311 
Conflicts:
	pkg/compute/guestdrivers/aws.go
	pkg/compute/guestdrivers/huawei.go
	pkg/compute/guestdrivers/openstack.go
	pkg/compute/models/guests.go
	pkg/compute/models/hosts.go
 2019-03-11 15:03:25 +08:00
邱剑 05096909ed Merge pull request #1206 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-nic-binding-support to release/2.6.0 
* commit '5fbebfaa817feb92f45a4f967e65afe37e49e2ac':
  fix: RHEL fsdirver fail to deploy networking scripts
  feature: nic binding support
 2019-03-11 14:54:20 +08:00
Qiu Jian 2552c658c4 fix: recode host.getWiresOfId 2019-03-11 14:32:36 +08:00
屈轩 cc6aff8743 openstack: 不创建flavor,仅查找合适的套餐 2019-03-11 10:43:57 +08:00
屈轩 fccb9218fc 优化命令结构 2019-03-11 10:38:18 +08:00
TangBin 7d74947202 add auto renew consts 2019-03-11 10:13:13 +08:00
Qiu Jian 621ac5f6af Make minimal sysdisk size to 10G 2019-03-11 09:48:00 +08:00
Qiu Jian 5fbebfaa81 fix: RHEL fsdirver fail to deploy networking scripts 2019-03-11 09:35:31 +08:00
Qiu Jian 7bdab6e02d feature: nic bonding/teaming support on region 2019-03-11 04:45:34 +08:00
Qiu Jian 53435a2528 feature: nic binding support 2019-03-11 04:43:12 +08:00
周有松 4cb2e883a3 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '332bf1e9e5bc9d0fd61236cee4b8fd4e941c26de':
  fix: try to sync disconnected account for every 24 hours
  fix: cloudaccount that is in stale syncing status should be auto-synced
 2019-03-10 15:34:26 +08:00
周有松 332bf1e9e5 Merge pull request #1202 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-allow-auto-sync-account-in-stale-syncing-state to release/2.7.0 
* commit 'b485f31e81c5fdffd6006ec85891e84ef936186a':
  fix: try to sync disconnected account for every 24 hours
  fix: cloudaccount that is in stale syncing status should be auto-synced
 2019-03-10 15:34:26 +08:00
周有松 d116336640 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '33c98697f52f6b25e672a15804af135385bcb4a3':
  fix: baremetal pxeboot fail to find record of preregistered baremetal
 2019-03-10 13:52:16 +08:00
周有松 33c98697f5 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '641db5ae2d6cfef4ef24279f6b548706a93ab24b':
  fix: baremetal pxeboot fail to find record of preregistered baremetal
 2019-03-10 13:52:16 +08:00
周有松 641db5ae2d Merge pull request #1200 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fail-to-pxe-bool-preregistered-baremetal to release/2.6.0 
* commit '6646ec8936a5bf1f61360d075a665a82efd4df3d':
  fix: baremetal pxeboot fail to find record of preregistered baremetal
 2019-03-10 13:52:15 +08:00
Qiu Jian b485f31e81 fix: try to sync disconnected account for every 24 hours 2019-03-09 20:14:16 +08:00
邱剑 a617a8d368 Merge pull request #1193 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.8.0 
* commit '26baad489eb652becc217d1013a24de0830c788f':
  support lvm partition
 2019-03-09 19:43:16 +08:00
邱剑 37e0399b0c Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'bd576fa9425764531b54b54e8db3012aa9480c7e':
  修复: joint 的对象创建时没有检验是否存在，会被重复添加
  show expired_at colume for host
  fix: validate host status before doing renew prepaid recycle
  fix: 1. skip using temporary binding mac at host startup 2. active baremetal NIC index always reset to 0
  fix: allow host attach to same wire with multiple interface
  fix: huawei filter excludes skus with null providers
  fix: exi host name conversion remove ip
 2019-03-09 19:40:32 +08:00