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
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
屈轩 a372336ca6 完成安全组同步代码重构 2019-03-18 15:44:44 +08:00
屈轩 b49623a7e5 同步公有云key加上前缀 2019-03-18 11:07:49 +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
邱剑 dcf55b9ff7 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'dc2a6d53fe9a0f7935aa0118f229fb31c8332f88':
  补充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
邱剑 4cb2ebc862 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '53feaef241efec5cd7f34d62fbe77a746441bde0':
  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
邱剑 5fc8909a84 Merge pull request #1267 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-vipkid-aws-access-tools to release/2.8.0 
* commit 'bd94daec0ca83069d376e6ca1f5e10a4e4ac72b6':
  minor updates
  feature: cloudaccount add options field to store additional options, such billing_report_bucket for AWS and balance_key for Azure
  feature: add cryptool for convenience
 2019-03-18 09:02:51 +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
邱剑 ad8e990f61 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '0c2efb51a141bb65541ed66b8b670d94093dd3d4':
  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 11:42:29 +08:00
wanyaoqi 53ece34f3b merge const pkg from cloudcommon to compute 2019-03-17 11:21:17 +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
Qiu Jian bd94daec0c minor updates 2019-03-16 20:29:04 +08:00
Qiu Jian b7d5746197 feature: cloudaccount add options field to store additional options, 
such billing_report_bucket for AWS and balance_key for Azure
 2019-03-16 20:24:24 +08:00
邱剑 11c097854c Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '0eb7d4ca07e3079e7275b0e26279347dc1942fd2':
  腾讯云项目使用自身的id
 2019-03-15 21:29:35 +08:00
屈轩 36c90af374 腾讯云项目使用自身的id 2019-03-15 21:02:08 +08:00
邱剑 ef5640f876 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'b48dc22b3ddbcf64aad4b242292798c8a2310bf6':
  guest do not sync status on guest delete
 2019-03-15 20:21:06 +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
邱剑 ff82a405d2 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'fb73a690365b5d5cedc010ec5849d897dabadb03':
  避免腾讯云eip长度超过限制
 2019-03-15 17:40:50 +08: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
邱剑 9364e2c99a Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '21fdf7bd1a9f663167ea66a6c8753bc6f63cd30b':
  避免腾讯云使用以/开头的密码
 2019-03-15 14:52:12 +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
屈轩 ee62f5d153 限制key必须是中英文、数字或者_ 2019-03-15 14:06:04 +08:00
李泽玺 8887748290 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '635b2c6a5e8c0c0a3416c0edb5e80488f8aa4b64':
  climc: override-pending-delete add '-f' short token
 2019-03-15 12:23:27 +08:00
wanyaoqi b67eb79797 fix cpu set 2019-03-15 12:20:30 +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
wanyaoqi e0ee2b8c59 fix package dependence 2019-03-15 11:45:56 +08:00