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
5,099 Commits 30 Branches 712 Tags
bd9c8ca780ff62731acbc872d6f0b5aff82640a4
Commit Graph
3323 Commits
Author SHA1 Message Date
TangBin bd9c8ca780 skus query fix 2019-03-20 16:28:51 +08:00
邱剑 648875e7b7 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '4213db3eb605217796850dd42a266dd0372a7e85':
  fix: make virtual interface pointer more general
  fix: 1. abstract baseagent, 2. extend baseagent to baremetalagent
 2019-03-20 15:10:41 +08:00
邱剑 f986db4706 Merge pull request #1285 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-seperate-private-cloud-on-premise to release/2.7.0 
* commit '99a10db949d80155dba0b830498f2bcef2774e37':
  fix: separate private cloud & on-premise
 2019-03-20 14:40:27 +08:00
Qiu Jian 99a10db949 fix: separate private cloud & on-premise 2019-03-19 22:14:01 +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
Qiu Jian 29245c931c fix: turn delete prepaid vm to postpaid, so as to allow deleting the vm 2019-03-19 20:00:22 +08:00
邱剑 4922d3a876 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '3ebe726100146b764598dbde96c546703e44d719':
  fix: baremetal tftp use local IP send response
 2019-03-19 19:53:25 +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
邱剑 3f1dfac8f1 Merge pull request #1268 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-cloud-provider-missing-sync-time to release/2.7.0 
* commit 'ca39f480580030b8f25f686a08de8a0c23d1e90d':
  fix: more accurate sync_status update time
  fix: cloud provider sync time is not set in auto-sync cycles
 2019-03-19 08:20:55 +08:00
Qiu Jian ca39f48058 fix: more accurate sync_status update time 2019-03-18 22:16:20 +08:00
邱剑 65a8a7bd82 Merge pull request #1278 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-project-src to release/2.7.0 
* commit '4b6ddfc3cf36230fac78019fd4d79d3aaa175a0d':
  默认创建的project_src为local
 2019-03-18 20:55:32 +08:00
邱剑 2a0600e7e0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'f71e16712851064d93f38f142c59ca7f2acac160':
  兼容disk json参数
 2019-03-18 20:55:12 +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
屈轩 4b6ddfc3cf 默认创建的project_src为local 2019-03-18 20:13:53 +08:00
邱剑 51f62c973b Merge pull request #1264 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-skus-query-fix to release/2.7.0 
* commit '6c040d4b76e21b5ffa6a53b1ba102ae2a4e730f2':
  skus group by GB
 2019-03-18 18:04:41 +08:00
邱剑 dc2a6d53fe Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'bfb7d69eab18488ead051755bad361bb67e0123f':
  补充esix缺失的ValidateDiskSize
  避免PerformCreateEip失败后guest状态一直不变
 2019-03-18 10:31:57 +08:00
屈轩 7bb46e5990 冲突解决 2019-03-18 10:25:39 +08:00
邱剑 53feaef241 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'f6fedf390f43e2ea1c0ef55b67f00bc7bdd5dfad':
  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:53 +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
Yousong Zhou 4f7a4177ac Merge remote-tracking branch 'origin/release/2.6.0' into feature/yousong-lbagent-managed 2019-03-17 02:35:09 +00: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
Qiu Jian 6fa0e254ef fix: cloud provider sync time is not set in auto-sync cycles 2019-03-16 21:23:43 +08:00
屈轩 36c90af374 腾讯云项目使用自身的id 2019-03-15 21:02:08 +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
邱剑 b48dc22b3d Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '8be49a8d69072e8afe18fd5cb8d8536345257e10':
  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
邱剑 fb73a69036 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'df9d1cd92cf4507292a57dccabf4c680efc7db4a':
  避免腾讯云eip长度超过限制
 2019-03-15 17:40:50 +08: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
TangBin 6c040d4b76 skus group by GB 2019-03-15 16:10:37 +08:00
wanyaoqi 389d64d92b guest do not sync status on guest delete 2019-03-15 15:49:53 +08:00
邱剑 21fdf7bd1a Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '7f8ea1b23e99bbe92d24a1b749a11f529a02724a':
  避免腾讯云使用以/开头的密码
 2019-03-15 14:52:11 +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
Zexi Li 902d50d4b3 climc: override-pending-delete add '-f' short token 2019-03-15 12:06:30 +08:00
屈轩 b5a8bb1f60 避免PerformCreateEip失败后guest状态一直不变 2019-03-15 11:57:35 +08:00