opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,574 Commits 27 Branches 687 Tags
35adcede87d21100a0b331f9ebe72ebddcdfb9f6
Commit Graph
1290 Commits
Author SHA1 Message Date
邱剑 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
邱剑 46b5a90ad4 Merge pull request #930 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgorup-detail to release/2.5.0 
* commit '3b60fa1238491b1bf41b491b16adbb459cee0912':
  避免前端更改描述字段后刷新没有相关字段
 2019-01-15 17:04:07 +08:00
屈轩 2794f188e5 允许zone-list显示location字段 2019-01-15 16:09:01 +08:00
屈轩 3b60fa1238 避免前端更改描述字段后刷新没有相关字段 2019-01-15 15:48:23 +08:00
Qiu Jian 7bdaac6882 修正：将包年包月资源池的虚拟存储从可用区域的存储列表中排除 2019-01-15 12:14:07 +08:00
wanyaoqi f7ee73934a fix network split 2019-01-15 11:43:29 +08:00
Qiu Jian d6a416acb2 修正：status检查主体引用错误 2019-01-15 10:51:30 +08:00
邱剑 f099e1cbd8 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '8d9f37af4a42398c48256b31516b178aa5543646':
  gofmt
  增加挂载磁盘、卸载磁盘日志
 2019-01-14 21:24:13 +08:00
Zhang Dongliang 4a17ff0e6b gofmt 2019-01-14 17:26:55 +08:00
Zhang Dongliang 83b6855d86 增加挂载磁盘、卸载磁盘日志 2019-01-14 17:25:24 +08:00
邱剑 55f5beb1cf Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '1570cfec28fb6967821a9b69fd7a4bc948d386e0':
  region: host list 去掉 container 计数
 2019-01-14 15:13:08 +08:00
Zexi Li ac02074cde region: host list 去掉 container 计数 2019-01-14 13:40:35 +08:00
Zexi Li b59b1c4519 region: host 支持通过 set-schedtag 接口添加删除调度标签 2019-01-14 12:32:18 +08:00
Qiu Jian 706238404e 修正：1. 包年包月资源池添加和减少操作需要做状态检查 2. 
同步时候忽略包年包月资源次的host和storage
 2019-01-11 21:13:40 +08:00
邱剑 befa02f7b1 Merge pull request #915 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secrule-port to release/2.5.0 
* commit 'bdcbd2a8f48b1e25971fa055bc92f9e330ab0c6d':
  避免参数ports未生效问题
 2019-01-11 12:28:44 +08:00
Zexi Li b82290d124 修复: spec 显示没有 enabled 的宿主机 2019-01-10 22:40:15 +08:00
邱剑 f61434aaf5 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'c5e96e7c1f6a99c6a9ac59f9f1a39ed098eb50b4':
  修复: spec 显示没有 enabled 的宿主机
 2019-01-10 22:35:20 +08:00
屈轩 bdcbd2a8f4 避免参数ports未生效问题 2019-01-10 20:11:43 +08:00
李泽玺 0c640fd179 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '40eb0119ceef64af5671c771bdb9b90cd66f4dfa':
  region: isolated_devices purge action
 2019-01-10 15:59:59 +08:00
Zexi Li 9eca0250ae region: isolated_devices purge action 2019-01-10 12:21:42 +08:00
Qiu Jian 01db84f737 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-vmware-sync-skip-failed-host 2019-01-09 20:54:48 +08:00
邱剑 75a790e8e6 Merge pull request #912 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-list-extend to release/2.5.0 
* commit 'b9a788018460e811717552c19281a0a4e8533b4e':
  server-list add disks info and isolated_device info
 2019-01-09 18:47:26 +08:00
wanyaoqi b9a7880184 server-list add disks info and isolated_device info 2019-01-09 18:33:54 +08:00
邱剑 61ea826f9a Merge pull request #909 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-vm-renew-not-effective to release/2.5.0 
* commit 'a14fad1b9cd1b7fcd3ede71ad35d2e120155fef1':
  修正：清理到期包年包月主机需要把删除保护去掉
  minor fixes
  修正对包年包月主机续费后没有效果的问题
 2019-01-09 18:31:54 +08:00
Qiu Jian a14fad1b9c 修正：清理到期包年包月主机需要把删除保护去掉 2019-01-09 18:26:42 +08:00
邱剑 b3f181df8f Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'd0bd046cbed8cb9bc1fd20ab2526c6ae924d37ff':
  避免因secret为空，导致插入数据库时报错: Field 'secret' doesn't have a default value
 2019-01-09 17:30:17 +08:00
邱剑 7f37ff8709 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'b3f181df8f4bb11dbf5416cf1271686289dcd920':
  避免因secret为空，导致插入数据库时报错: Field 'secret' doesn't have a default value
 2019-01-09 17:30:17 +08:00
邱剑 d15d835c58 Merge pull request #910 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-fix-unmarshal-nil to release/2.5.0 
* commit 'd3d7d395f3c1230a86c0e8eef3621ef243dfb08c':
  避免unmarshal nil
 2019-01-09 17:29:55 +08:00
屈轩 d3d7d395f3 避免unmarshal nil 2019-01-09 17:19:31 +08:00
Qiu Jian 4fb3974367 修正对包年包月主机续费后没有效果的问题 2019-01-09 16:42:59 +08:00
屈轩 6285f13983 避免因secret为空，导致插入数据库时报错: Field 'secret' doesn't have a default value 2019-01-09 16:08:08 +08:00
Qiu Jian e3766653f6 修正：1. allowattach rbac compatible 2. server insert iso fail 2019-01-09 10:27:30 +08:00
Qiu Jian 3745065611 修正：1. vmware同步宿主机出错后应该尽力而为地同步所有能同步的机器 2. 
保存镜像时，如果缺少osType报错
 2019-01-09 00:24:33 +08:00
Zexi Li 5c0b04973a region: support server import 2019-01-08 21:32:57 +08:00
邱剑 0dabca7839 Merge pull request #898 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/add-network-merge-split to release/2.4.0 
* commit '33120a005a777b719b28c87a38b342cb25d3b20b':
  add network merge split
 2019-01-07 21:49:32 +08:00
邱剑 a6e3d788cb Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '0dabca78396cdd8dc0339acc3f2049422e417d2f':
  add network merge split
 2019-01-07 21:49:32 +08:00
Qiu Jian 34352ae5db Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.5.0-20190107 
Conflicts:
	pkg/util/aliyun/aliyun.go
 2019-01-07 21:39:00 +08:00
邱剑 60da9abae0 Merge pull request #901 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-aliyun-delete-fail to release/2.4.0 
* commit '766039194898267d32322aca50213cc06daa82d6':
  return nil immediately if error is nil
  修正：1. server detach disk 缺少parentTaskId 2. aliyun 关机后立即 detachDisk 会出现InvalidOperation.Conflict的错误
 2019-01-07 20:57:51 +08:00
邱剑 a9cf799495 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '7f5fd08aaeff161682ba1c116d989fa953dfd6b3':
  修正：host启用netif时应该优先使用server_type为baremetal的network
 2019-01-07 16:27:31 +08:00
邱剑 7f5fd08aae Merge pull request #902 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-enable-netif-use-guest-network to release/2.4.0 
* commit '14b9b2314c88ad743c02cc67b2d26f255bf44eb4':
  修正：host启用netif时应该优先使用server_type为baremetal的network
 2019-01-07 16:27:30 +08:00
Qiu Jian 14b9b2314c 修正：host启用netif时应该优先使用server_type为baremetal的network 2019-01-07 01:59:54 +08:00
Qiu Jian eef83be10c 修正：1. server detach disk 缺少parentTaskId 2. aliyun 关机后立即 
detachDisk 会出现InvalidOperation.Conflict的错误
 2019-01-06 20:54:49 +08:00
屈轩 418c4620a1 补充openstack driver 2019-01-06 14:11:37 +08:00
wanyaoqi 33120a005a add network merge split 2019-01-05 22:37:21 +08:00
Qiu Jian d2f2beb4c8 修正：capability接口返回的hypervisor列表中忽略了baremetal 2019-01-05 20:18:00 +08:00
邱剑 83ca2c0802 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '6db7d1c91e9dffdd373af5d87581471406bcdcbb':
  卸载磁盘时状态为init的,默认进行删除操作,并直接设置磁盘状态未卸载中
 2019-01-05 20:15:18 +08:00
邱剑 6db7d1c91e Merge pull request #897 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-detach-disk-status to release/2.4.0 
* commit '8fe57af4a2831f55bca5dc97d0a9e02ab6fceb2e':
  卸载磁盘时状态为init的,默认进行删除操作,并直接设置磁盘状态未卸载中
 2019-01-05 20:15:18 +08:00
邱剑 143083d2cf Merge pull request #883 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-storage-cache-image-missing-format to release/2.5.0 
* commit 'e5aa26f0afbfadc847e4399a19ae798eafac0d57':
  修正：1. storagecache.CacheImage接口需要指定format 2. PerformAction默认返回ActionNotFound Error
 2019-01-05 20:14:39 +08:00
邱剑 54b1df6ed3 Merge pull request #886 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-vipkid-prepaid-features to release/2.5.0 
* commit 'ffe6d3910d8dccbab848fb1c08f81a8c0521ee65':
  增加climc zone-update-status命令
  server-create创建prepaid主机，增加auto_prepaid_recycle参数，创建后自动加入包年包月资源池
  minor fixes
  minor changes: 防止float类型的column设置default后每次都要更新
  增加：1. 包年包月主机加入资源池后，如果auto_delete=true，则自动删除该主机 2. 包年包月资源池的宿主机支持续费操作Perform(host.id, "renew-prepaid-recycle", {"duration": "1m"})
 2019-01-05 20:14:17 +08:00
屈轩 8fe57af4a2 卸载磁盘时状态为init的,默认进行删除操作,并直接设置磁盘状态未卸载中 2019-01-05 19:13:41 +08:00