opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-30 18:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,220 Commits 30 Branches 712 Tags
11776d2781b8ea1500e1db4aec9f32f8a2df9e90
Commit Graph
3405 Commits
Author SHA1 Message Date
wanyaoqi 11776d2781 filter by not in secgroup 2019-03-20 11:59:20 +08:00
wanyaoqi ce04b4d4a9 servers filter by vpc 2019-03-19 21:40:29 +08:00
邱剑 68f4e5e425 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '4922d3a8769c9a0c878046f9ac25db39b643dcfc':
  fix: baremetal tftp use local IP send response
 2019-03-19 19:53:25 +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
邱剑 116067b02a Merge pull request #1223 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-tag to release/2.8.0 
* commit '43daa1ceb420d8b6176e92ee7c023d51c9c8e962':
  用户自定义标签加前缀user:
  同步公有云key加上前缀
  限制key必须是中英文、数字或者_
  允许只传key进行过滤
  取消key以_开头key限制
  metadata返回列表使用复数
  支持server disk 过滤
  支持标签
 2019-03-19 15:59:46 +08:00
屈轩 43daa1ceb4 用户自定义标签加前缀user: 2019-03-19 11:26:33 +08:00
邱剑 2a84a50b8b Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '3f1dfac8f16f0e40f68277a7fda345113b4f1064':
  fix: more accurate sync_status update time
  fix: cloud provider sync time is not set in auto-sync cycles
 2019-03-19 08:20:56 +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
邱剑 a868005689 Merge pull request #1245 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.8.0 
* commit 'b67eb79797040b211d0b2ab4bb2f8988d06c78d4':
  fix cpu set
  fix cgroups
 2019-03-18 22:08:27 +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
邱剑 ef058a61f1 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '65a8a7bd82a30cd51b3ca17e6100bae75ea76393':
  默认创建的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
邱剑 21b464ab9e Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '2a0600e7e063105d22f9bc504381697d57f724f9':
  兼容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
邱剑 98e4b70606 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '51f62c973be602b42db85c6a3fde236d3049af6e':
  skus group by GB
 2019-03-18 18:04:41 +08:00
邱剑 7d1d851244 Merge pull request #1255 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/fix-package-dependence to release/2.8.0 
* commit '53ece34f3b424d4430b1198ea06a66456a4a9a12':
  merge const pkg from cloudcommon to compute
  fix package dependence
 2019-03-18 17:18:35 +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