Commit Graph
1636 Commits
Author SHA1 Message Date
Qiu Jian c62424aa2c change yunionroot => cloudroot 2018-11-17 12:54:56 +08:00
TangBin ab4bb74e17 make fmt 2018-11-17 10:26:19 +08:00
TangBin bc1fae8ebb rebuild root disk 2018-11-17 10:25:25 +08:00
邱剑 f6338b4af8 Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'b4747c7a6fe91cf6ca28b85bb6c8a47df73d764a':
  重复使用已分配的未使用网卡
  去除不需要接口
  避免公有云找不到对应的cloudregion
2018-11-16 23:14:45 +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
邱剑 2f1a74852d Automatic merge from release/2.3.0 -> release/2.4.0
* commit '1c14ea16fd4b669afd4339618c6e3963d14f27d4':
  解决冲突
2018-11-16 21:47:23 +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
邱剑 835de026fc Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'a291be31d4b41d691683bbf6e01c1114a4d036e2':
  去除主机名中文字符
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
邱剑 19d4bdfb71 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '917345a4f77b7d374379d81fd6c8aead071f00a6':
  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
屈轩 a07ab4c121 初始化model 2018-11-16 15:05:05 +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
邱剑 118e339e13 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '0e4bdc92f2a814bede3ebb72b907d52b90768c1a':
  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
邱剑 a5ce78ea86 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '7c1b77a5fc3efa1fb8afcfad5cb0d1f2582460d1':
  使用调度标签限制调度创建经典实例
2018-11-15 21:15:21 +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
邱剑 1ab14c8007 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '475db4c6354b0ca312678a076987ecf813744d56':
  补充Azure创建快照功能
2018-11-15 18:18:23 +08:00
屈轩 580202e8be 解决冲突 2018-11-15 18:16:53 +08:00
TangBin 010f5c1f97 vpc fix 2018-11-15 18:00:40 +08:00
屈轩 ce70ab3300 补充Azure创建快照功能 2018-11-15 12:01:22 +08:00
李泽玺 305714beee Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'ac620132dd956dbf6c9afca180f66c0c9a5218d9':
  schedule k8s local volume
  region-dns: use k8s.SKubeClusterManager
2018-11-15 11:50:24 +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
邱剑 7fe534de05 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '73e753beb76aba7ea7374f8c344c6a5b270bf3ea':
  优化腾讯云请求失败重试
2018-11-15 11:13:56 +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
TangBin ebbedb9458 vpc & securtiy group sync 2018-11-14 20:32:16 +08:00
邱剑 dedbb3848e Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'f72ee1063fc29b2c840648c143c7c3dfb6d578cb':
  避免Azure绑定秘钥时stop机器
  更新Azure密钥后直接返回
2018-11-14 16:15:56 +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
TangBin 74c024c52e add latitude & longitude info 2018-11-14 15:45:14 +08:00
屈轩 5c09c64644 更新Azure密钥后直接返回 2018-11-14 15:28:13 +08:00
邱剑 88ebe6fed8 Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'b2ffa81af90bb330b42d212edb11f55da40334be':
  优化azure secgroup规则同步
2018-11-13 22:03:33 +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
TangBin 5f5a0e2fb7 add more log & fix YunionSecRuleToAws\ 2018-11-13 20:14:06 +08:00
TangBin f62c5fa22e snapshot region id bugfix 2018-11-13 19:19:04 +08:00
TangBin 538ee71202 snapshot delete & disk reset 2018-11-13 17:45:53 +08:00
TangBin 826717129b add more log 2018-11-13 15:57:05 +08:00
邱剑 caa2c7b7c0 Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'ce24455d1ba3931e66954cc5603adca765a26306':
  Azure挂载卸载磁盘更改lun有可能会失败
2018-11-13 12:00:40 +08:00