Commit Graph
14633 Commits
Author SHA1 Message Date
Qu Xuan 18aff683f9 fix(region): optimized qcloud tag sync 2021-09-09 17:40:34 +08:00
Zexi Li 1af88b6a56 Merge pull request #12164 from ioito/automated-cherry-pick-of-#12162-upstream-release-3.7
Automated cherry pick of #12162: fix(region): sync apsara region
2021-09-09 16:29:38 +08:00
Qu Xuan 51917559d3 fix(region): sync apsara region 2021-09-09 15:49:23 +08:00
Zexi Li 8b02a108cc Merge pull request #12159 from swordqiu/automated-cherry-pick-of-#12157-upstream-release-3.7
Automated cherry pick of #12157: fix: set disk driver and network driver for converting esxi to kvm
2021-09-08 23:06:37 +08:00
Zexi Li b976c9a555 Merge pull request #12151 from zhaoxiangchun/automated-cherry-pick-of-#12149-upstream-release-3.7
Automated cherry pick of #12149: fix(monitor): add monitor resource details field
2021-09-08 22:52:29 +08:00
Zexi Li 2ebba2d0e8 Merge pull request #12156 from ioito/automated-cherry-pick-of-#12154-upstream-release-3.7
Automated cherry pick of #12154: fix(region): sync aliyun qcloud default project
2021-09-08 22:51:36 +08:00
Qiu Jian f678eb97bf fix: set disk driver and network driver for converting esxi to kvm 2021-09-08 22:29:31 +08:00
Qu Xuan 7c71578ae0 fix(region): sync aliyun qcloud default project 2021-09-08 20:30:04 +08:00
zhaoxiangchun 9e9d72d3ca fix(monitor): add monitor resource details field 2021-09-08 17:39:37 +08:00
Zexi Li 601c76236a Merge pull request #12143 from rainzm/automated-cherry-pick-of-#12141-upstream-release-3.7
Automated cherry pick of #12141: fix(devtool): get tenant info via correct field
2021-09-08 16:25:32 +08:00
Zexi Li 88e8d3119b Merge pull request #12147 from ioito/automated-cherry-pick-of-#12145-upstream-release-3.7
Automated cherry pick of #12145: fix(region): resource apsara resource id not found error
2021-09-08 16:21:28 +08:00
Qu Xuan c4ba8aa63f fix(region): resource apsara resource id not found error 2021-09-08 15:55:07 +08:00
Zexi Li 9c800297b7 Merge pull request #12139 from ioito/automated-cherry-pick-of-#12126-upstream-release-3.7
Automated cherry pick of #12126: fix(region): apsara default region
2021-09-08 15:54:35 +08:00
rainzm dd5a0e93b8 fix(devtool): get tenant info via correct field 2021-09-08 15:34:58 +08:00
Qu Xuan 768560c4d7 fix(region): apsara default region 2021-09-08 14:27:36 +08:00
Zexi Li d6920ce23c Merge pull request #12128 from ioito/automated-cherry-pick-of-#12126-upstream-release-3.7
Automated cherry pick of #12126: fix(region): apsara default region
2021-09-08 13:58:19 +08:00
Zexi Li dc86c09e1f Merge pull request #12136 from swordqiu/automated-cherry-pick-of-#12134-upstream-release-3.7
Automated cherry pick of #12134: fix(region): change disk and network drivers for Esxi converted VM
2021-09-08 12:01:47 +08:00
Qiu Jian 056243e99a fix(region): change disk and network drivers for Esxi converted VM 2021-09-08 11:48:15 +08:00
Zexi Li b0a5a95344 Merge pull request #12132 from tb365/automated-cherry-pick-of-#12130-upstream-release-3.7
Automated cherry pick of #12130: fix(region): hcso sync server fix
2021-09-08 10:47:28 +08:00
tb365 4a32b970bf fix(region): hcso sync server fix 2021-09-08 10:42:32 +08:00
Qu Xuan 85c052a6ee fix(region): apsara default region 2021-09-08 10:36:24 +08:00
Zexi Li d10353a824 Merge pull request #12123 from ioito/automated-cherry-pick-of-#12121-upstream-release-3.7
Automated cherry pick of #12121: fix(region): apsara endpoint fix
2021-09-07 15:25:52 +08:00
Qu Xuan 679437989a fix(region): apsara endpoint fix 2021-09-07 14:29:38 +08:00
Zexi Li 545a466561 Merge pull request #12119 from rainzm/automated-cherry-pick-of-#12117-upstream-release-3.7
Automated cherry pick of #12117: fix(devtool): create serviceurl
2021-09-07 10:50:30 +08:00
rainzm d8d330d3d5 fix(devtool): create serviceurl 2021-09-07 10:37:21 +08:00
Zexi Li 9bd95312d7 Merge pull request #12115 from tb365/automated-cherry-pick-of-#12114-upstream-release-3.7
Automated cherry pick of #12114: NetworkUsableZoneIds remove duplicate zone ids
2021-09-06 21:47:56 +08:00
tb365 50d8f10b4e NetworkUsableZoneIds remove duplicate zone ids 2021-09-06 14:43:32 +08:00
Zexi Li 6731704344 Merge pull request #12107 from rainzm/automated-cherry-pick-of-#12105-upstream-release-3.7
Automated cherry pick of #12105: feat(devtool): add sshinfo and serviceurl
2021-09-05 16:58:49 +08:00
rainzm 5151880ec5 feat(devtool): add sshinfo and serviceurl 2021-09-04 18:31:35 +08:00
Zexi Li 0d20002e6e fix(baremetal): reindex nic (#12088) 2021-09-03 02:39:26 +08:00
Zexi Li 68e7ce0325 Merge pull request #12092 from zexi/automated-cherry-pick-of-#12090-upstream-release-3.7
Automated cherry pick of #12090: fix(climc-base): update tag to 20210901
2021-09-02 23:15:00 +08:00
Zexi Li 39dd4b116e Merge pull request #12095 from tb365/automated-cherry-pick-of-#12094-upstream-release-3.7
Automated cherry pick of #12094: fix(region): lb list search address fix
2021-09-02 18:32:29 +08:00
Zexi Li 52dd82a46d Merge pull request #12099 from zhaoxiangchun/automated-cherry-pick-of-#12097-upstream-release-3.7
Automated cherry pick of #12097: fix(monitor): monitor resource apiHelper fix
2021-09-02 18:30:28 +08:00
zhaoxiangchun 9904a6c4e9 fix(monitor): monitor resource apiHelper fix
1. apiHeleper 中增加interface,对应的ModelSet可以指定资源过滤参数
2. monitor删除过期的资源
2021-09-02 14:39:42 +08:00
tb365 7416d71d7c fix(region): lb list search address fix 2021-09-02 14:16:15 +08:00
Zexi Li 4670e4c014 Merge pull request #12070 from rainzm/automated-cherry-pick-of-#12067-upstream-release-3.7
Automated cherry pick of #12067: feat(region): allow custom sshport when make sshable
2021-09-02 11:43:47 +08:00
Zexi Li 8f7de66cfb fix(climc-base): update tag to 20210901 2021-09-01 20:18:13 +08:00
Zexi Li 2b1d6c4ff6 Merge pull request #12082 from ioito/automated-cherry-pick-of-#12080-upstream-release-3.7
Automated cherry pick of #12080: fix(region): access group policy
2021-09-01 16:36:00 +08:00
Zexi Li 875a88046a Merge pull request #12078 from tb365/automated-cherry-pick-of-#12077-upstream-release-3.7
Automated cherry pick of #12077: lb list api support search elastic ip
2021-09-01 15:17:14 +08:00
Zexi Li acfc20be7c Merge pull request #12085 from swordqiu/automated-cherry-pick-of-#12083-upstream-release-3.7
Automated cherry pick of #12083: fix: add ceph-common to climc image, so as to make rbcli work
2021-09-01 14:48:20 +08:00
Qiu Jian e1e58ef110 fix: add ceph-common to climc image, so as to make rbcli work 2021-09-01 12:36:33 +08:00
rainzm b56e56bcbf feat(region): allow custom sshport when make sshable 2021-09-01 11:49:16 +08:00
Qu Xuan 209b23044e fix(region): access group policy 2021-09-01 11:18:27 +08:00
tb365 68019186ab lb list api support search elastic ip 2021-09-01 11:11:49 +08:00
Zexi Li 73bc984bcc Merge pull request #12074 from swordqiu/automated-cherry-pick-of-#12072-upstream-release-3.7
Automated cherry pick of #12072: fix: do not lock system account user
2021-08-31 21:02:00 +08:00
Qiu Jian e6fbedf770 fix: do not lock system account user 2021-08-31 17:45:09 +08:00
Zexi Li 647be15a78 Merge pull request #12044 from tb365/automated-cherry-pick-of-#12043-upstream-release-3.7
Automated cherry pick of #12043: count host fix
2021-08-31 16:25:10 +08:00
tb365 92b8720bb6 change host type to hcso 2021-08-31 15:49:42 +08:00
tb365 aeab880a64 count host fix 2021-08-31 15:49:42 +08:00
yunion-ci-robot 873e88e2b8 Merge pull request #12066 from zexi/climc-host-delete
fix(climc): host-delete use batch delete function
2021-08-31 15:24:08 +08:00