Commit Graph
1186 Commits
Author SHA1 Message Date
Zexi Li 4d6fbcdf0c scheduler: dynamicschedtags support 2018-10-18 18:01:31 +08:00
Qiu Jian 352e4816a6 minor fixes 2018-10-18 15:58:09 +08:00
Qiu Jian bf4fa5aa3a Add manager_tenant_id to host details 2018-10-18 12:23:37 +08:00
Qiu Jian dfa5a634ab 修正:cloudprovider/cloudacount的代码recode 2018-10-18 12:22:50 +08:00
Qiu Jian b319a5722b Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-dynamic-schedtag 2018-10-17 21:42:10 +08:00
邱剑 93bc41c167 Merge pull request #291 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloud-account to release/2.3.0
* commit 'e7bd5dfa66588a8e8fd2bcfb93ce401641945bc2':
  减少调用层级
  支持云账号主次之分
2018-10-17 21:16:44 +08:00
邱剑 154d6afedf Automatic merge from release/2.2.0 -> release/2.3.0
* commit '3fa36d3869bf425ced7b80ab67b9c155e7b8f019':
  imageId不能更改,尝试删除之前的系统盘,第一次删除会失败,第二次一般会成功
2018-10-17 21:09:21 +08:00
邱剑 3fa36d3869 Merge pull request #305 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-rebuild-root to release/2.2.0
* commit '7a5c4c990e5b038db38ffc52aac3b37f90673464':
  imageId不能更改,尝试删除之前的系统盘,第一次删除会失败,第二次一般会成功
2018-10-17 21:09:21 +08:00
邱剑 c3ea407b2f Merge pull request #309 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.3.0 to release/2.3.0
* commit '1b2db4a452ae400958d95473bc570979dae1ad52':
  Azure禁止使用root账户登录,创建机器后返回默认用户名,避免数据不一致
  创建完disk后同步有用信息
  补充aliyuncli delete-snapshot命令
2018-10-17 21:08:55 +08:00
屈轩 e7bd5dfa66 减少调用层级 2018-10-17 21:03:12 +08:00
屈轩 1b2db4a452 解决冲突 2018-10-17 20:39:28 +08:00
屈轩 7a5c4c990e imageId不能更改,尝试删除之前的系统盘,第一次删除会失败,第二次一般会成功 2018-10-17 20:32:12 +08:00
邱剑 78a4c1ba87 Merge pull request #306 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-account to release/2.2.0
* commit 'ec432d1ee9f16e8be0ab9218cfd4bf7362065cbe':
  Azure禁止使用root账户登录,创建机器后返回默认用户名,避免数据不一致
2018-10-17 20:21:30 +08:00
邱剑 67add2b108 Merge pull request #304 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-create-sync-data to release/2.2.0
* commit '8df405ffd38d65e8efdc3d629cce4cf5aaea285c':
  创建完disk后同步有用信息
2018-10-17 20:18:40 +08:00
邱剑 580bc942a4 Merge pull request #303 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyuncli-snapshot to release/2.2.0
* commit '7ca7052d11623a9a9251f561b651d385e19e3643':
  补充aliyuncli delete-snapshot命令
2018-10-17 20:17:35 +08:00
屈轩 ec432d1ee9 Azure禁止使用root账户登录,创建机器后返回默认用户名,避免数据不一致 2018-10-17 18:49:07 +08:00
屈轩 8df405ffd3 创建完disk后同步有用信息 2018-10-17 18:14:03 +08:00
邱剑 f32ac21e78 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '681c46e90572f7dc6d29fd69e5f5a898ee6a5fd4':
2018-10-17 18:02:34 +08:00
邱剑 681c46e905 Merge pull request #302 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-uniq-zone to release/2.2.0
* commit '58d6bd1ba034b277417ddd63602390d301158149':
2018-10-17 18:02:33 +08:00
邱剑 20cf5be92a Merge pull request #299 in YUNIONIO/onecloud from bugfix/rex-20181016-aliyun-reset-actionlog to release/2.2.0
* commit '1736eacb2157825a5c91daed4d977b26f18d6d92':
  调整带宽 task: CLOUD-561云服务器调整带宽后,操作日志记录的内容应该准确
  增加日志服务黑名单,去掉配置服务的操作日志
2018-10-17 17:43:46 +08:00
邱剑 f7ba920b90 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '20cf5be92a7df191690aeceea66a421fea0a8865':
  调整带宽 task: CLOUD-561云服务器调整带宽后,操作日志记录的内容应该准确
  增加日志服务黑名单,去掉配置服务的操作日志
2018-10-17 17:43:46 +08:00
屈轩 7ca7052d11 补充aliyuncli delete-snapshot命令 2018-10-17 17:23:26 +08:00
邱剑 58d6bd1ba0 Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'f0e712e8d1c5fcbba2bfdf6491c2ba9c04486755':
  修复parallel task未初始化subtask
2018-10-17 17:16:30 +08:00
邱剑 084d2f1cdd Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'f0e712e8d1c5fcbba2bfdf6491c2ba9c04486755':
  修复parallel task未初始化subtask
2018-10-17 16:58:53 +08:00
邱剑 442040d030 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '084d2f1cdd7b2b3b674ed168a31f015088d105be':
  修复parallel task未初始化subtask
2018-10-17 16:58:53 +08:00
邱剑 f0e712e8d1 Automatic merge from release/2.0.0 -> release/2.1.0
* commit 'a5dfd52413ab09c3842320a210badfeee56d703b':
  修复parallel task未初始化subtask
2018-10-17 16:58:53 +08:00
邱剑 a5dfd52413 Merge pull request #300 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-parallel-task to release/2.0.0
* commit '42176ea94856f44acf0528386205b712ac05ee4b':
  修复parallel task未初始化subtask
2018-10-17 16:58:53 +08:00
Zhang Dongliang 1736eacb21 调整带宽 task: CLOUD-561云服务器调整带宽后,操作日志记录的内容应该准确 2018-10-17 16:18:17 +08:00
屈轩 42176ea948 修复parallel task未初始化subtask 2018-10-17 16:12:35 +08:00
Zhang Dongliang da241e9cbb 增加日志服务黑名单,去掉配置服务的操作日志 2018-10-17 15:03:38 +08:00
Qiu Jian fc777095c1 改进:增加schedpolicy和dynamicschedtag支持 2018-10-17 08:12:21 +08:00
邱剑 94ff2fed00 Merge pull request #297 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-azure-id to release/2.2.0
* commit 'e6d40509040c436d427a98ff230f432ded91c1a7':
  避免因大小写不一致导致同步时删除原有的数据
2018-10-16 19:43:17 +08:00
邱剑 26553ff096 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '94ff2fed00fa743c1035d06a4bc8c622cb951064':
  避免因大小写不一致导致同步时删除原有的数据
2018-10-16 19:43:17 +08:00
邱剑 05efb6c116 Merge pull request #296 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-dnsrecrods-enabled to release/2.3.0
* commit '7e3e8a01ce2c0a2251c4f05d12b1cfdda71b26a0':
  dns: fix compilation error
  climc: add dns-enable, dns-disable
  dnsrecords: add enabled field
2018-10-16 19:42:29 +08:00
屈轩 e6d4050904 避免因大小写不一致导致同步时删除原有的数据 2018-10-16 19:40:20 +08:00
屈轩 8ef86da0de Merge branch 'release/2.3.0' of ssh://git.yunion.io/~quxuan/onecloud into hotfix/qx-cloud-account 2018-10-16 18:38:47 +08:00
张东亮 b3cbcc26ef Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'c61f18d88e9a967f6c780456d4ae635bb94d9485':
  fmt
  onecloud 增加重启的 actionlog
2018-10-16 18:11:49 +08:00
张东亮 c61f18d88e Merge pull request #295 in YUNIONIO/onecloud from bugfix/rex-20181016-aliyun-reset-actionlog to release/2.2.0
* commit '44f051a9ac80308ea58b58215d2eb83cef97d2fd':
  fmt
  onecloud 增加重启的 actionlog
2018-10-16 18:11:48 +08:00
李泽玺 6a9ba82120 Merge pull request #292 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-host-usable-filter to release/2.3.0
* commit '98dc897eeb29c9adc2b080e87857e11b28fb73e7':
  增加:host-list增加usable过滤器
2018-10-16 18:08:15 +08:00
邱剑 988adf7bd8 Merge pull request #294 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:hotfix/wyq/snapshot-more-details to release/2.2.0
* commit '374d5319318a1bf035665c852a8b398bfe35475e':
  add snapshot-list filter by storage type
2018-10-16 17:23:46 +08:00
邱剑 9f6db4f986 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '988adf7bd84dec69115a548bf1860af1fe1e27ca':
  add snapshot-list filter by storage type
2018-10-16 17:23:46 +08:00
Yousong Zhou 7e3e8a01ce dns: fix compilation error
# yunion.io/x/onecloud/pkg/dns
	pkg/dns/dns.go:237:44: cannot use "" (type string) as type mcclient.IIdentityProvider in argument to models.HostManager.SEnabledStatusStandaloneResourceBaseManager.SStatusStandaloneResourceBaseManager.SStandaloneResourceBaseManager.FetchByName:
		string does not implement mcclient.IIdentityProvider (missing GetProjectId method)
2018-10-16 09:13:52 +00:00
Yousong Zhou 1bcfa41427 climc: add dns-enable, dns-disable 2018-10-16 09:11:43 +00:00
Yousong Zhou d6cd05079e dnsrecords: add enabled field
CLOUD-586
2018-10-16 09:11:43 +00:00
wanyaoqi 374d531931 add snapshot-list filter by storage type 2018-10-16 16:59:52 +08:00
Zhang Dongliang 44f051a9ac fmt 2018-10-16 16:16:30 +08:00
Zhang Dongliang adc306b1cc onecloud 增加重启的 actionlog 2018-10-16 16:09:14 +08:00
邱剑 fb84a9e508 Merge pull request #293 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:hotfix/wyq/snapshot-more-details to release/2.2.0
* commit 'e0751c0e1593f12f9daf18819e93f50de78bde64':
  add disk-create-snapshot, bug fix
2018-10-16 13:55:19 +08:00
邱剑 8772c01004 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'fb84a9e5086f74418a1f2a2352b926ff4effd34a':
  add disk-create-snapshot, bug fix
2018-10-16 13:55:19 +08:00
wanyaoqi e0751c0e15 add disk-create-snapshot, bug fix 2018-10-16 13:52:54 +08:00