Commit Graph
401 Commits
Author SHA1 Message Date
Qiu Jian c62424aa2c change yunionroot => cloudroot 2018-11-17 12:54:56 +08:00
屈轩 0770e52eea 解决冲突 2018-11-16 23:08:29 +08:00
邱剑 5a507dd0a9 Merge pull request #518 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-snapshot-region-id to release/2.2.0
* commit '503bec34c86f2b00ed54736ec988ab5a4f11bc9e':
  去除不需要接口
  避免公有云找不到对应的cloudregion
2018-11-16 23:03:30 +08:00
屈轩 54dda9496f 重复使用已分配的未使用网卡 2018-11-16 21:40:57 +08:00
屈轩 5568a009d1 解决冲突 2018-11-16 21:37:02 +08:00
屈轩 503bec34c8 去除不需要接口 2018-11-16 17:59:45 +08:00
邱剑 a291be31d4 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '2453fadf997916972d5e118aef5c0bd9b36e9471':
  去除主机名中文字符
2018-11-16 17:24:04 +08:00
屈轩 110fdc1d24 去除主机名中文字符 2018-11-16 17:23:03 +08:00
邱剑 917345a4f7 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '4890c6aea26a731596f11a6368ea7436dac17231':
  Azure主机名称带上region信息,避免名称重复
2018-11-16 17:20:46 +08:00
屈轩 de45f88830 Azure主机名称带上region信息,避免名称重复 2018-11-16 17:16:58 +08:00
屈轩 2e868ed7c1 避免公有云找不到对应的cloudregion 2018-11-16 16:09:02 +08:00
邱剑 0e4bdc92f2 Merge pull request #515 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-rbac-20181115 to release/2.3.0
* commit '4034ee517e55bda87a71d81d59d3b770474e3792':
  make fmt
  skip cloutpost
  make rbac default enabled
  增加user/guest两个权利等级
  minor fixes
2018-11-16 14:41:55 +08:00
Qiu Jian 4034ee517e make fmt 2018-11-16 01:43:01 +08:00
Qiu Jian 2734d2f5db 增加user/guest两个权利等级 2018-11-16 01:32:01 +08:00
Qiu Jian ca0e3977c7 minor fixes 2018-11-15 23:41:04 +08:00
邱剑 7c1b77a5fc Automatic merge from release/2.2.0 -> release/2.3.0
* commit '0befda17797db0ee1bceb624cdf4bbd79069f8d6':
  使用调度标签限制调度创建经典实例
2018-11-15 21:15:20 +08:00
屈轩 4035cbe363 使用调度标签限制调度创建经典实例 2018-11-15 21:13:16 +08:00
屈轩 580202e8be 解决冲突 2018-11-15 18:16:53 +08:00
屈轩 ce70ab3300 补充Azure创建快照功能 2018-11-15 12:01:22 +08:00
李泽玺 ac620132dd Merge pull request #506 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-pv-sched to release/2.3.0
* commit '8d7360298f3c4fcd03b44719f519082c3ad118e7':
  schedule k8s local volume
  region-dns: use k8s.SKubeClusterManager
2018-11-15 11:50:24 +08:00
邱剑 73e753beb7 Merge pull request #498 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-request-optimization to release/2.3.0
* commit '5e19f0b0c1e04521a4002e4a2be79b4929b91fac':
  优化腾讯云请求失败重试
2018-11-15 11:13:56 +08:00
Zexi Li 43255fe7e8 region-dns: use k8s.SKubeClusterManager 2018-11-15 00:41:06 +08:00
屈轩 5e19f0b0c1 优化腾讯云请求失败重试 2018-11-14 20:56:17 +08:00
邱剑 f72ee1063f Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'f18eb7ddec21a3016fbd698cf5a7fa4c6e3603d2':
  避免Azure绑定秘钥时stop机器
  更新Azure密钥后直接返回
2018-11-14 16:15:55 +08:00
屈轩 5c09c64644 更新Azure密钥后直接返回 2018-11-14 15:28:13 +08:00
邱剑 82fe6e2d45 Merge pull request #494 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-secgroup-optimization to release/2.2.0
* commit '9737f65716f6780755b8e5bfc995938a5199094f':
  优化azure secgroup规则同步
2018-11-13 22:03:32 +08:00
邱剑 b2ffa81af9 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '82fe6e2d45431cad88ead06298a107c9886d19dd':
  优化azure secgroup规则同步
2018-11-13 22:03:32 +08:00
屈轩 9737f65716 优化azure secgroup规则同步 2018-11-13 20:58:27 +08:00
邱剑 ce24455d1b Automatic merge from release/2.2.0 -> release/2.3.0
* commit '5fb53912d86d4159ccc963899dd3b6eee54127d7':
  Azure挂载卸载磁盘更改lun有可能会失败
2018-11-13 12:00:40 +08:00
屈轩 472dbfdfef Azure挂载卸载磁盘更改lun有可能会失败 2018-11-13 11:52:37 +08:00
唐斌 b1acc90be3 Merge pull request #468 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-fix-make-regiondns-error to release/2.3.0
* commit '6599ddc53b9a0ddb46c85ce08238c6e90c3e4b03':
  rm transitive dependents
  fix depends
  fix region-dns build error
2018-11-13 10:51:11 +08:00
TangBin 68028cb781 fix region-dns build error 2018-11-12 20:09:01 +08:00
邱剑 cea85cc780 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'e555b116d1668ceb2d1286f78b746f183046ea61':
  避免创建云盘时显示经典类型storage
2018-11-12 19:46:49 +08:00
屈轩 8d4b7a1e64 避免创建云盘时显示经典类型storage 2018-11-12 17:26:59 +08:00
TangBin 4c3ae8f976 Merge branch 'release/2.3.0' into feature/tb-support-aws 2018-11-10 20:03:07 +08:00
TangBin 74e3f9a699 update vendor 2018-11-10 20:00:36 +08:00
邱剑 9c91085004 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '12a03a8f7deea52a25b293a9cf6ba5012359e636':
  避免调度到Azure经典类型主机上
2018-11-10 15:30:31 +08:00
屈轩 84559581d4 避免调度到Azure经典类型主机上 2018-11-10 15:28:22 +08:00
李泽玺 bd548462a4 Merge pull request #452 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-scheduler-extender to release/2.3.0
* commit '95f49ead841ef7918c5d7d7a96f05806dc13902f':
  scheduler: k8s scheduler extender
2018-11-10 14:32:43 +08:00
TangBin 4b9c26aee2 add more log 2018-11-10 14:00:22 +08:00
邱剑 492469887b Merge pull request #431 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-qcloud to release/2.3.0
* commit 'aab792ffa8ee7f873ab24d5d9ae66bc7ef3ec548':
  添加部分aliyun操作
  支持腾讯云资源导入
2018-11-10 13:35:05 +08:00
Zexi Li 95f49ead84 scheduler: k8s scheduler extender 2018-11-10 13:27:00 +08:00
邱剑 fb6d1082af Automatic merge from release/2.2.0 -> release/2.3.0
* commit '182db4cd4e16a384be25ad05ffbe63df2a7f3efa':
  跟随主机创建的磁盘,跟随主机删除
  fix: reverseproxy out of fds
2018-11-09 20:40:20 +08:00
屈轩 d73fd87227 跟随主机创建的磁盘,跟随主机删除 2018-11-09 20:30:56 +08:00
Yousong Zhou 9388748e45 pkg: httputils: ParseJSONResponse(): rewrite for clearness
Make it more clear that it's possible the function can return with
body==nil and err==nil
2018-11-08 15:36:24 +00:00
TangBin d71357f906 security group add id tag 2018-11-08 20:21:15 +08:00
TangBin 467630e0b3 security group sync 2018-11-08 19:18:01 +08:00
屈轩 aab792ffa8 添加部分aliyun操作 2018-11-08 15:37:30 +08:00
TangBin c55f802148 upload image 2018-11-08 15:34:01 +08:00
Qiu Jian 1d0ad17e36 fix format 2018-11-08 11:39:48 +08:00