Commit Graph
10842 Commits
Author SHA1 Message Date
tangbin ee8166352a fix redis reset account password action log 2020-08-01 10:53:59 +08:00
tangbin 9f3684a1f6 loadblancer listener modify name fix 2020-08-01 10:53:34 +08:00
rainzm 2e3a4abca3 fix(region): Don't allow address conflicts under vpc
Except for default vpc, vpc and wire have a one-to-one correspondence.
So prohibiting the address conflict of wire does not avoid
the address conflict of default vpc.
2020-08-01 10:52:27 +08:00
Zexi Li a14da344c0 Merge pull request #7439 from swordqiu/automated-cherry-pick-of-#7438-upstream-release-3.2
Automated cherry pick of #7438: fix: sync share mode between vpc and wire
2020-08-01 10:39:28 +08:00
Zexi Li a3f71e8959 Merge pull request #7443 from wanyaoqi/automated-cherry-pick-of-#7441-upstream-release-3.2
Automated cherry pick of #7441: fix deploy admin auth key
2020-08-01 00:06:33 +08:00
wanyaoqi d925cb080d fix deploy admin auth key 2020-07-31 23:24:46 +08:00
Zexi Li 3ca28cfcc7 baremetal: fix hpssactl split last LV size out of limit (#7428) 2020-07-31 22:40:02 +08:00
Qiu Jian 8c33cc9445 fix: sync share mode between vpc and wire 2020-07-31 22:30:16 +08:00
Zexi Li 37b9a960ef Merge pull request #7420 from ioito/automated-cherry-pick-of-#7417-upstream-release-3.2
Automated cherry pick of #7417: fix: avoid lost backend params
2020-07-31 18:07:59 +08:00
Zexi Li f69370c4db Merge pull request #7415 from ioito/automated-cherry-pick-of-#7413-upstream-release-3.2
Automated cherry pick of #7413: fix: openstack win image user data need encode
2020-07-31 18:06:48 +08:00
Zexi Li fb8f8847d0 Merge pull request #7407 from ioito/automated-cherry-pick-of-#7405-upstream-release-3.2
Automated cherry pick of #7405: fix: avoid account sync deadlock
2020-07-31 18:05:31 +08:00
Zexi Li fc7de4722b Merge pull request #7408 from swordqiu/automated-cherry-pick-of-#7400-upstream-release-3.2
Automated cherry pick of #7400: fix: ignore general s3 set acl not implemented error
2020-07-31 18:04:05 +08:00
屈轩andQu Xuan f43af31195 fix: 避免glance metadata-list project scope无权限 (#7404)
Co-authored-by: Qu Xuan <quxuan@yunionyun.com>
2020-07-31 18:01:48 +08:00
屈轩andQu Xuan 0b13608d90 fix: 优化openstack项目认证 (#7399)
Co-authored-by: Qu Xuan <quxuan@yunionyun.com>
2020-07-31 18:00:17 +08:00
屈轩andQu Xuan 04e1a25c60 fix: 避免在仅调整虚拟机磁盘时opslog日志记录mem cpu异常 (#7394)
Co-authored-by: Qu Xuan <quxuan@yunionyun.com>
2020-07-31 17:57:02 +08:00
Qu Xuan b09dbdd69f fix: avoid lost backend params 2020-07-31 17:19:49 +08:00
Qu Xuan ae26dc1214 fix: openstack win image user data need encode 2020-07-31 16:55:43 +08:00
Qu Xuan cbc4739b1a fix: avoid account sync deadlock 2020-07-31 16:32:57 +08:00
Qiu Jian 5cfe521a23 fix: ignore general s3 set acl not implemented error 2020-07-31 16:31:52 +08:00
Zexi Li 1dd8a0c066 Merge pull request #7389 from rainzm/automated-cherry-pick-of-#7387-upstream-release-3.2
Automated cherry pick of #7387: fix(region): zone from guesttemplate's preferzone maybe nil
2020-07-30 17:41:49 +08:00
rainzm 661611f338 fix(region): zone from guesttemplate's preferzone maybe nil 2020-07-30 16:12:36 +08:00
Zexi Li 5bfd7f3494 Merge pull request #7353 from ioito/automated-cherry-pick-of-#7318-upstream-release-3.2
Automated cherry pick of #7318: fix: openstack多项目问题
2020-07-30 15:53:40 +08:00
Zexi Li 4553879a1a Merge pull request #7386 from ioito/automated-cherry-pick-of-#7384-upstream-release-3.2
Automated cherry pick of #7384: fix: avoid parse json err nil pointer
2020-07-30 15:15:38 +08:00
Qu Xuan fb25efa0cf fix: openstack多项目问题 2020-07-30 14:48:16 +08:00
Qu Xuan 7c2268417b fix: avoid parse json err nil pointer 2020-07-30 11:32:31 +08:00
Zexi Li 97be89b9f6 Merge pull request #7380 from ioito/automated-cherry-pick-of-#7378-upstream-release-3.2
Automated cherry pick of #7378: fix: 添加阿里云rds备份恢复限制条件
2020-07-29 21:38:48 +08:00
Zexi Li 4e31734f0e Merge pull request #7376 from swordqiu/automated-cherry-pick-of-#7375-upstream-release-3.2
Automated cherry pick of #7375: fix: change owner should check required domain list
2020-07-29 17:31:44 +08:00
Qu Xuan 6d0b4f37f7 fix: 添加阿里云rds备份恢复限制条件 2020-07-29 16:56:24 +08:00
Qiu Jian 244e83b8ae fix: change owner should check required domain list 2020-07-29 13:01:14 +08:00
Zexi Li dd42c55d1e Merge pull request #7374 from ioito/automated-cherry-pick-of-#7358-upstream-release-3.2
Automated cherry pick of #7358: fix: 普通视图下,安全组仅统计可看到的vm count
2020-07-29 10:27:18 +08:00
Zexi Li c9f61ca7d5 Merge pull request #7361 from ioito/automated-cherry-pick-of-#7359-upstream-release-3.2
Automated cherry pick of #7359: fix: 修复vm绑定重复安全组
2020-07-28 20:56:06 +08:00
Qu Xuan 439cf1948e fix: 普通视图下,安全组仅统计可看到的vm count 2020-07-28 20:53:32 +08:00
Zexi Li d2916c079f Merge pull request #7370 from ioito/automated-cherry-pick-of-#7368-upstream-release-3.2
Automated cherry pick of #7368: fix: 同步sku与磁盘类型关系
2020-07-28 20:48:10 +08:00
Qu Xuan cf294a1f58 fix: 同步sku与磁盘类型关系 2020-07-28 19:47:50 +08:00
Zexi Li 63bff57a05 Merge pull request #7366 from zexi/automated-cherry-pick-of-#7364-upstream-release-3.2
Automated cherry pick of #7364: adjust schedule resource condition width
2020-07-28 18:50:29 +08:00
Zexi Li 620b31e0f3 Merge pull request #7356 from ioito/automated-cherry-pick-of-#7354-upstream-release-3.2
Automated cherry pick of #7354: fix: 避免创建rds备份时对rds进行一些操作
2020-07-28 18:49:47 +08:00
Zexi Li 95b21d541d adjust schedule resource condition width 2020-07-28 18:37:23 +08:00
Qu Xuan d6782d5324 fix: 修复vm绑定重复安全组 2020-07-28 18:15:45 +08:00
Qu Xuan fd233a6869 fix: 避免创建rds备份时对rds进行一些操作 2020-07-28 16:03:06 +08:00
Zexi Li 92a7fad56c Merge pull request #7340 from rainzm/automated-cherry-pick-of-#7338-upstream-release-3.2
Automated cherry pick of #7338: fix(region): Remove default secgroup for esxi guest
2020-07-27 19:49:24 +08:00
Zexi Li 788c845ca3 Merge pull request #7345 from rainzm/automated-cherry-pick-of-#7343-upstream-release-3.2
Automated cherry pick of #7343: fix: modify list details for guesttemplate
2020-07-27 19:48:28 +08:00
Zexi Li 7554cd5268 Merge pull request #7322 from swordqiu/automated-cherry-pick-of-#7321-upstream-release-3.2
Automated cherry pick of #7321: fix: choose candidate list from the list returned from backend
2020-07-27 15:53:56 +08:00
Zexi Li 15fe440911 Merge pull request #7325 from swordqiu/automated-cherry-pick-of-#7324-upstream-release-3.2
Automated cherry pick of #7324: fix: schedtag should be system resource
2020-07-27 15:49:59 +08:00
Zexi Li 7a4d0cf507 Merge pull request #7328 from tb365/automated-cherry-pick-of-#7327-upstream-release-3.2
Automated cherry pick of #7327: huawei fetch regions&projects fix
2020-07-27 15:21:51 +08:00
rainzm 0824b5445e Add metadata for GuestTempalte details 2020-07-27 15:18:40 +08:00
rainzm 951f53a96b Add network info when list scalingGroup details 2020-07-27 15:18:40 +08:00
rainzm 260d259392 fix: modify list details for guesttemplate 2020-07-27 15:18:40 +08:00
Zexi Li 54b16d94c7 Merge pull request #7333 from swordqiu/automated-cherry-pick-of-#7332-upstream-release-3.2
Automated cherry pick of #7332: fix: cloud account delete may fail due to inconsistent status
2020-07-27 15:13:01 +08:00
rainzm 52008bace0 fix(region): Remove default secgroup for esxi guest
1. InitializeData remove all secgroup_id of esxi guest from database
2. Set input.SecgroupId as empty for guest whose GetMaxSecurityGroupCount
return 0
2020-07-27 14:54:19 +08:00
屈轩andQu Xuan 5df48d5b76 fix: 避免status_code>=400并且resp为空时err为nil (#7266)
Co-authored-by: Qu Xuan <quxuan@yunionyun.com>
2020-07-27 04:43:24 +08:00