opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-29 17:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,701 Commits 30 Branches 712 Tags
06ae94ebe3e434a8148b5103c9fc5b9dcfd93674
Commit Graph
3111 Commits
Author SHA1 Message Date
Qiu Jian 06ae94ebe3 fix: simplify rbac policy condition to match projects and roles 2019-03-21 01:03:51 +08:00
Qiu Jian 2c022cd0ef fix: make virtual interface pointer more general 2019-03-19 20:18:48 +08:00
Qiu Jian cafc5daa63 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-baremetal-agent 2019-03-19 20:08:52 +08:00
Zexi Li a92f781a2e fix: baremetal tftp use local IP send response 2019-03-19 19:44:08 +08:00
Qiu Jian 090984f9d2 fix: 1. abstract baseagent, 2. extend baseagent to baremetalagent 2019-03-19 12:28:21 +08:00
邱剑 f71e167128 Merge pull request #1256 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-create-disk-json-params to release/2.6.0 
* commit 'ec764d2d1d8ebf1686eeff9e94469dfc1b317485':
  兼容disk json参数
 2019-03-18 20:55:11 +08:00
屈轩 7bb46e5990 冲突解决 2019-03-18 10:25:39 +08:00
邱剑 f6fedf390f Merge pull request #1269 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-remote-file-support-retry-glance to release/2.6.0 
* commit 'deafebd3e0ce4b2fd92d35739a5816aba5817871':
  fix: 1. remote file will retry glance if peer url is not available 2. ssh authorized keys ends with \n
 2019-03-18 09:04:52 +08:00
邱剑 458f73e0f7 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '91f58349cbe1756a22de95758d1ef93d7243ad63':
  避免PerformCreateEip失败后guest状态一直不变
 2019-03-18 08:58:50 +08:00
邱剑 91f58349cb Merge pull request #1260 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-create-eip to release/2.4.0 
* commit 'b5a8bb1f6091b4b8075037d96b4966626006a419':
  避免PerformCreateEip失败后guest状态一直不变
 2019-03-18 08:58:49 +08:00
邱剑 b2105ea5a7 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '25465096a7d8b3c4d4b5935bf0b3e42c75b4b2cc':
  补充esix缺失的ValidateDiskSize
 2019-03-18 08:56:36 +08:00
屈轩 0aebfd37a5 补充esix缺失的ValidateDiskSize 2019-03-17 14:43:32 +08:00
邱剑 019df55b82 Merge pull request #1258 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-lbagent-managed to release/2.6.0 
* commit '1b879d1b2409a6b1b56d67fa23b4ef53617383a4':
  lbagent: try using unicast vrrp
  lbagent: report ip, ha_state, version
  lbagent: always reload on startup
  lbagent: making agent params with reflect
  netutils2: add MyIP() for finding default source ip
 2019-03-17 00:04:37 +08:00
Qiu Jian deafebd3e0 fix: 1. remote file will retry glance if peer url is not available 2. 
ssh authorized keys ends with \n
 2019-03-16 21:34:07 +08:00
邱剑 8be49a8d69 Merge pull request #1263 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/do-not-sync-status-on-guest-delete to release/2.6.0 
* commit '389d64d92b955ef04d29abe56086cd323a0334fc':
  guest do not sync status on guest delete
 2019-03-15 20:21:05 +08:00
Yousong Zhou 1b879d1b24 lbagent: try using unicast vrrp 2019-03-15 12:11:22 +00:00
Yousong Zhou 33f568717b lbagent: report ip, ha_state, version 2019-03-15 12:11:22 +00:00
Yousong Zhou 41bcd59cc1 lbagent: always reload on startup 
Instead of at the next resync tick
 2019-03-15 12:11:22 +00:00
Yousong Zhou fdb0571c5c lbagent: making agent params with reflect 2019-03-15 12:11:22 +00:00
Yousong Zhou 15e4708f71 netutils2: add MyIP() for finding default source ip 2019-03-15 12:11:22 +00:00
邱剑 ce319b767c Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f813e663c6299df93fed445bf69779224777bab3':
  避免腾讯云eip长度超过限制
 2019-03-15 17:40:49 +08:00
邱剑 f813e663c6 Merge pull request #1262 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-eip-name to release/2.4.0 
* commit 'd63c000b787e845a65762c6eb2b488c4eec7a44b':
  避免腾讯云eip长度超过限制
 2019-03-15 17:40:49 +08:00
邱剑 df9d1cd92c Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'ce319b767c0fa3a31ecadafd17a1b62c3e046197':
  避免腾讯云eip长度超过限制
 2019-03-15 17:40:49 +08:00
wanyaoqi 389d64d92b guest do not sync status on guest delete 2019-03-15 15:49:53 +08:00
邱剑 7f8ea1b23e Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '7974b7127f490c40b19b7fb20621b74df1162f77':
  避免腾讯云使用以/开头的密码
 2019-03-15 14:52:11 +08:00
邱剑 7974b7127f Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '3beb002e5d749fe4bfdd9964f73ee352b5e83702':
  避免腾讯云使用以/开头的密码
 2019-03-15 14:52:10 +08:00
屈轩 d63c000b78 避免腾讯云eip长度超过限制 2019-03-15 14:32:16 +08:00
屈轩 c40dc1edcd 避免腾讯云使用以/开头的密码 2019-03-15 14:23:19 +08:00
屈轩 b5a8bb1f60 避免PerformCreateEip失败后guest状态一直不变 2019-03-15 11:57:35 +08:00
邱剑 d37160a90f Merge pull request #1246 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/fix-capabilities to release/2.6.0 
* commit 'f3554fe30f3b1fe30a1ea832190f7d2d4747a384':
  make capabilities optional
 2019-03-14 23:12:41 +08:00
屈轩 ec764d2d1d 兼容disk json参数 2019-03-14 20:26:58 +08:00
邱剑 268866f8a2 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'ffb25c7121c513a7e610433dd90a4345998609a1':
  腾讯云续费实例没有ClientToken参数
 2019-03-14 18:28:41 +08:00
邱剑 0205a6fc4a Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '268866f8a23c8b8ec353406f7c5cdb55fd966cfb':
  腾讯云续费实例没有ClientToken参数
 2019-03-14 18:28:41 +08:00
周有松 b161f5af44 Merge pull request #1234 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-renew-instance to release/2.6.0 
* commit '5624a294daf9b9fb85d76c5523b7fed939accfbf':
  optimize huawei renew
  wait huawei instance renew sucess
  huawei instance renew bugfix
 2019-03-14 17:45:25 +08:00
屈轩 8dde1cae02 腾讯云续费实例没有ClientToken参数 2019-03-14 16:55:32 +08:00
邱剑 3c8d6a7337 Merge pull request #1248 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-conflicts-fix-release2.6.0-314 to release/2.6.0 
* commit '9464f71ed2a609398c71897e9649108bdaeda382':
  add skus util function test
  soldout skus fix & add more comment
 2019-03-14 15:38:20 +08:00
TangBin 9464f71ed2 fix conflicts 2019-03-14 12:33:53 +08:00
wanyaoqi f3554fe30f make capabilities optional 2019-03-14 12:13:37 +08:00
TangBin 5624a294da optimize huawei renew 2019-03-14 11:05:37 +08:00
TangBin 173098a998 fix conflicts 2019-03-14 10:53:52 +08:00
Yousong Zhou 098d62bdc5 treewide: 改进opslog记录update diff 
action为ACT_UPDATE，仅当len(UpdateDiffs) > 0时才记录
 2019-03-13 14:20:54 +00:00
邱剑 223c9f6461 Merge pull request #1224 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-goimports to release/2.6.0 
* commit '8fe4f2ec98110dece5412f7980a0085725b7e993':
  treewide: group imports with goimports
 2019-03-13 21:01:20 +08:00
邱剑 df6bc80c89 Merge pull request #1228 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-disk-resize-backport-from-2.8 to release/2.6.0 
* commit '2d863896854beee27168f5dd2f00aafb9dbe1131':
  fix disk resize
 2019-03-13 20:56:16 +08:00
Yousong Zhou 8fe4f2ec98 treewide: group imports with goimports 
./goimports -w -local yunion.io/x/onecloud/ -corp yunion.io/x/ $GOPATH/src/yunion.io/x/onecloud/{cmd,pkg}
 2019-03-13 10:46:12 +00:00
邱剑 4cf5c87a5a Merge pull request #1229 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-use-agent-manageruri-to-visit-agent to release/2.6.0 
* commit '64bb1b15db4e6ff7c5afb10059b6bdcbf7b54c10':
  fix: use agent manageruri instance of endpoint to visit agents
 2019-03-13 17:39:09 +08:00
TangBin caf6540e61 wait huawei instance renew sucess 2019-03-13 16:55:01 +08:00
邱剑 9448fde22d Merge pull request #1222 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-msyd-bugfix-20190312 to release/2.6.0 
* commit '1ca00c14c6d0e3e9342f8e2a0a5586f6b2fc7a2c':
  fix: find image peer host with local storage only
  fix: filter cached images by storage status
  remove debug logs
  fix: usage port state not correct
  fix: 1. usage hide system servers 2. host undo convert shows wrong status
 2019-03-13 16:28:32 +08:00
TangBin ebe6e378e1 huawei instance renew bugfix 2019-03-13 15:51:21 +08:00
TangBin a32ddd4364 add skus util function test 2019-03-13 15:33:11 +08:00
TangBin d9baf4c462 soldout skus fix & add more comment 2019-03-13 12:09:59 +08:00