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
3,814 Commits 30 Branches 714 Tags
563e637ce40625f22a69ce3a0a05efefd0fc8def
Commit Graph
328 Commits
Author SHA1 Message Date
Qiu Jian d1b9f1f5c6 允许普通用户获取cachedimages列表 2019-01-23 21:25:44 +08:00
邱剑 53211bdb46 Merge pull request #950 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-create-server-with-native-images to release/2.6.0 
* commit '9df351b5f9b8788e9ff43577816c551df8ac3567':
  make fmt import
  minor fixes for vmware
  补充esxi相关功能
  fixes for qcloud&azure
  改进：获取azure官方镜像， 还缺少使用azure官方镜像创建主机的支持
  增加：1. 将公有云标准镜像同步到本地 2. 可以从公有云标准镜像创建主机 3. 在公有云缓存镜像时遵守公有云镜像的配额
 2019-01-23 00:07:33 +08:00
屈轩 b9dd5052ca 冲突解决 2019-01-22 16:29:08 +08:00
邱剑 6f732d1edc Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '0aafe01ee8d8934f54b75b1c2366c5dd72857101':
  避免project未找到直接返回err
 2019-01-22 16:18:37 +08:00
屈轩 3e4b8fed08 避免project未找到直接返回err 2019-01-22 16:17:10 +08:00
Qiu Jian beb2ac66b5 增加：1. 将公有云标准镜像同步到本地 2. 可以从公有云标准镜像创建主机 3. 
在公有云缓存镜像时遵守公有云镜像的配额
 2019-01-21 09:21:02 +08:00
Qiu Jian 305baf5d5f update vendor 2019-01-16 18:04:40 +08:00
Qiu Jian 706238404e 修正：1. 包年包月资源池添加和减少操作需要做状态检查 2. 
同步时候忽略包年包月资源次的host和storage
 2019-01-11 21:13:40 +08:00
Qiu Jian 06c9e6eb7e make fmt 2019-01-09 20:56:31 +08:00
Qiu Jian 606802b582 修正：1. attach权限校验总是false 2. 增加climc user 
default_project_id相关方法
 2019-01-09 20:49:26 +08:00
Qiu Jian e3766653f6 修正：1. allowattach rbac compatible 2. server insert iso fail 2019-01-09 10:27:30 +08:00
邱剑 397c7f1e69 Merge pull request #894 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fetch-by-global-unique-name to release/2.5.0 
* commit 'ceaa929cdd844d18c28da14c84592afdf1417648':
  在名称不冲突的情况下，允许非owner用户使用name访问资源
 2019-01-07 21:49:46 +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
wanyaoqi 33120a005a add network merge split 2019-01-05 22:37:21 +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
Qiu Jian ceaa929cdd 在名称不冲突的情况下，允许非owner用户使用name访问资源 2019-01-05 17:47:30 +08:00
Qiu Jian 6744fb8a4a server-create创建prepaid主机，增加auto_prepaid_recycle参数，创建后自动加入包年包月资源池 2019-01-05 17:28:34 +08:00
Qiu Jian 051f5fcb6b minor fixes 2019-01-05 16:22:09 +08:00
Qiu Jian e5aa26f0af 修正：1. storagecache.CacheImage接口需要指定format 2. 
PerformAction默认返回ActionNotFound Error
 2019-01-04 17:36:54 +08:00
邱剑 f920267721 Merge pull request #876 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-delete-server-require-override-pending-delete to release/2.4.0 
* commit 'd1d032411efb09a65ce6076ada84ddef172f8146':
  host-list增加mem_cmtbound
  disk add allowdeleteitem
  修正：1. 删除伪删除主机、磁盘需要override-pending-delete参数 2. joint-update支持auto_create参数 3. 删除主机时候detach磁盘，清理安全组
 2019-01-04 13:16:49 +08:00
邱剑 3f08aab84a Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f9202677218c02f3f5e7683a7ccab25c1db2d7db':
  host-list增加mem_cmtbound
  disk add allowdeleteitem
  修正：1. 删除伪删除主机、磁盘需要override-pending-delete参数 2. joint-update支持auto_create参数 3. 删除主机时候detach磁盘，清理安全组
 2019-01-04 13:16:49 +08:00
Qiu Jian 5b63de31bc 修正：1. 删除伪删除主机、磁盘需要override-pending-delete参数 2. 
joint-update支持auto_create参数 3. 删除主机时候detach磁盘，清理安全组
 2019-01-03 19:39:22 +08:00
邱剑 9422e59ed1 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '9918896ac3aaf67572338b66eb1133c99142265a':
  补充admin resource列表
 2019-01-03 12:28:11 +08:00
Qiu Jian e6c93767f0 补充admin resource列表 2019-01-02 21:25:46 +08:00
屈轩 adb95b27df 更新vendor 2019-01-02 17:38:59 +08:00
屈轩 54e3e2fba2 获取openstack compute api version 2019-01-02 17:37:51 +08:00
Qiu Jian f413e9c6b4 修正image和yunionconf默认权限 2019-01-01 00:48:04 +08:00
Qiu Jian 018e372173 minor fixes 2018-12-29 13:43:49 +08:00
Qiu Jian 1e4789285d minor improvements 2018-12-28 20:24:23 +08:00
Qiu Jian df41b7cdcd use separate worker for long running tasks, such as ImageConvertTask, 
ImageCheckTask, CloudProviderSyncInfoTask
 2018-12-27 16:19:24 +08:00
Qiu Jian a99ded14e3 minor fixes 2018-12-27 00:07:15 +08:00
Qiu Jian cd3f46871a minor fixes 2018-12-27 00:05:57 +08:00
Qiu Jian dca4a1e478 update vendor & make compatible 2018-12-26 23:51:51 +08:00
Qiu Jian 7d8cb846f9 move version, qemutil, qemuimg from cloudcommon to util 2018-12-26 22:59:59 +08:00
Qiu Jian b2f4c667eb fix bugs 2018-12-26 22:59:59 +08:00
Qiu Jian 88566645e0 add doc.go && make ParseOptions changes 
Conflicts:
	pkg/cloudcommon/options.go
	pkg/compute/service/service.go
	pkg/webconsole/service/service.go
	pkg/yunionconf/service/service.go
 2018-12-26 22:59:08 +08:00
Qiu Jian f9d9617220 update fmt & doc 2018-12-26 22:52:25 +08:00
Qiu Jian 2e587bd6ab glance重构 update 1 
Conflicts:
	Gopkg.lock
	pkg/appsrv/appsrv.go
	pkg/cloudcommon/options.go
	pkg/compute/models/hosts.go
	pkg/compute/models/quotas.go
	pkg/compute/service/service.go
	pkg/mcclient/mcclient.go
 2018-12-26 22:52:13 +08:00
Qiu Jian c70201b177 temp commit 
Conflicts:
	Gopkg.lock
	Gopkg.toml
	vendor/yunion.io/x/pkg/util/sysutils/storagetypes.go
	vendor/yunion.io/x/structarg/structarg.go
 2018-12-26 22:44:03 +08:00
邱剑 7bc741d973 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '32095aa1e7385930598c9dfbc0aeb54c39839b40':
  修正：rbac每次获取policy失败后，会time.After两次回调
 2018-12-26 21:14:10 +08:00
Qiu Jian f489e67af6 修正：rbac每次获取policy失败后，会time.After两次回调 2018-12-26 18:50:31 +08:00
邱剑 da088e5999 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'fed631c9d6e296941a54fa4113fda2b8428718e9':
  在2.4把owner_allow的权限表示从allow改回owner
 2018-12-26 11:41:55 +08:00
Qiu Jian c7ac542061 在2.4把owner_allow的权限表示从allow改回owner 2018-12-26 11:39:58 +08:00
邱剑 d591107841 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '0160435badff246450843911e38d971136b2e7fd':
  修正：可以通过SyncOnce方法强制刷新policy缓存
 2018-12-25 20:16:55 +08:00
Qiu Jian 957bc822ac 修正：可以通过SyncOnce方法强制刷新policy缓存 2018-12-25 20:13:31 +08:00
邱剑 83a529f234 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f10b31c0bdee8e6d1f2d4cfa5457d83cc0256f82':
  client session add context
 2018-12-25 15:25:52 +08:00
邱剑 f10b31c0bd Merge pull request #834 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/client-session-add-ctx to release/2.4.0 
* commit '742a67b0f847813c5fa7245514330f44bbef0486':
  client session add context
 2018-12-25 15:25:52 +08:00
wanyaoqi 742a67b0f8 client session add context 2018-12-25 13:33:33 +08:00
邱剑 fd9861c4a4 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '53a03de0e9df3cbc762b6d4d26861f37ca9ce4b4':
  修正：policy默认采用json解码，只有climc才采用yaml
  minor updates
  fix admin resource list
  修正：由后端来确定一个资源是否是管理资源（无owner的资源）
 2018-12-24 23:34:31 +08:00
邱剑 53a03de0e9 Merge pull request #823 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-add-admin-resource-info to release/2.4.0 
* commit 'de2ecb6be7f9a1aff867c2cec09cf10a89f17572':
  修正：policy默认采用json解码，只有climc才采用yaml
  minor updates
  fix admin resource list
  修正：由后端来确定一个资源是否是管理资源（无owner的资源）
 2018-12-24 23:34:31 +08:00