Commit Graph

10969 Commits

Author SHA1 Message Date
Zexi Li
f3bc3ca51d Merge pull request #7282 from rainzm/automated-cherry-pick-of-#7281-upstream-release-3.3
Automated cherry pick of #7281: fix(esxi): Select correct unitNumber for ide control when creating disk
2020-07-22 13:52:22 +08:00
Rain Zheng
7c82002903 fix(esxi): Select correct unitNumber for ide control when creating disk 2020-07-21 20:48:39 +08:00
yunion-ci-robot
3599904eee Merge pull request #7271 from zexi/automated-cherry-pick-of-#7270-upstream-release-3.3
Automated cherry pick of #7270: baremetal: set zone when enable netif
2020-07-21 11:48:24 +08:00
yunion-ci-robot
194105f4d3 Merge pull request #7268 from tb365/automated-cherry-pick-of-#7267-upstream-release-3.3
Automated cherry pick of #7267: fix GetOrCreateVpcForClassicNetwork
2020-07-20 20:49:28 +08:00
Zexi Li
ea374ac0c0 Merge pull request #7263 from tb365/automated-cherry-pick-of-#7237-upstream-release-3.3
Automated cherry pick of #7237: huawei eip delete fix
2020-07-20 20:47:39 +08:00
Zexi Li
df4d88e195 baremetal: set zone when enable netif 2020-07-20 20:45:06 +08:00
tangbin
f9c4221125 fix GetOrCreateVpcForClassicNetwork 2020-07-20 18:28:48 +08:00
Zexi Li
f246c47a33 Merge pull request #7258 from yousong/bugfix/yousong-lbagent-create-influxdb
[3.3] region: lbagents: skip tls check for default influxdb endpoint url
2020-07-20 12:21:51 +08:00
tangbin
fdcaa1c8e7 huawei eip delete fix 2020-07-20 10:52:31 +08:00
Yousong Zhou
7f7aef031a region: lbagents: skip tls check for default influxdb endpoint url 2020-07-20 09:01:50 +08:00
Zexi Li
1451a75646 Merge pull request #7239 from rainzm/automated-cherry-pick-of-#7238-upstream-release-3.3
Automated cherry pick of #7238: fix: default vpc must be shared globally
2020-07-20 02:09:39 +08:00
Zexi Li
5c57493f5b Merge pull request #7240 from ioito/automated-cherry-pick-of-#7225-upstream-release-3.3
Automated cherry pick of #7225: fix: rds备份恢复优化
2020-07-20 02:07:41 +08:00
Zexi Li
af2bf4e8cd Merge pull request #7229 from wanyaoqi/automated-cherry-pick-of-#7228-upstream-release-3.3
Automated cherry pick of #7228: fix server sync status
2020-07-20 02:06:28 +08:00
Zexi Li
42fbf12d66 Merge pull request #7235 from ioito/automated-cherry-pick-of-#7234-upstream-release-3.3
Automated cherry pick of #7234: fix: globalvpc跟随云账号共享
2020-07-20 02:05:09 +08:00
Zexi Li
1ec53dbf7f Merge pull request #7257 from zhaoxiangchun/automated-cherry-pick-of-#7256-upstream-release-3.3
Automated cherry pick of #7256: 修复监控报警规则删除的问题
2020-07-20 02:03:50 +08:00
Zexi Li
37c2e004fb Merge pull request #7233 from tb365/automated-cherry-pick-of-#7231-upstream-release-3.3
Automated cherry pick of #7231: acl delete condition fix
2020-07-20 02:02:36 +08:00
zhaoxiangchun
c65fc0f1dc 修复监控报警规则删除的问题 2020-07-19 21:29:13 +08:00
Zexi Li
c371e04aaf Merge pull request #7249 from wanyaoqi/automated-cherry-pick-of-#7248-upstream-release-3.3
Automated cherry pick of #7248: fix error output
2020-07-19 20:53:47 +08:00
Zexi Li
9c61ce86cc Merge pull request #7255 from zexi/automated-cherry-pick-of-#7254-upstream-release-3.3
Automated cherry pick of #7254: scheduler: fix storage filter duplicate error message
2020-07-19 20:52:53 +08:00
Zexi Li
d6b1fa02d8 scheduler: fix storage filter duplicate error message 2020-07-19 20:26:56 +08:00
Zexi Li
e3cd4be117 Merge pull request #7253 from swordqiu/automated-cherry-pick-of-#7251-upstream-release-3.3
Automated cherry pick of #7251: fix: quota usage not updated after disk resizing
2020-07-19 20:25:12 +08:00
Qiu Jian
508f30901a fix: quota usage not updated after disk resizing 2020-07-19 13:25:04 +08:00
wanyaoqi
18bae18498 fix error output 2020-07-19 12:35:04 +08:00
Qu Xuan
ecb7249a1d fix: rds备份恢复优化 2020-07-18 20:47:47 +08:00
rainzm
fa67bd8312 fix: default vpc must be shared globally
1. For default vpc, prohibit private operation.
2. For default vpc, prohibit public operation without scope 'system'.
2020-07-18 19:42:19 +08:00
Qu Xuan
f8471832e9 fix: globalvpc跟随云账号共享 2020-07-17 20:46:32 +08:00
tangbin
3e5eceeefa acl delete condition fix 2020-07-17 20:44:52 +08:00
wanyaoqi
0e617ec137 fix server sync status 2020-07-17 20:25:16 +08:00
Zexi Li
9b1ea9f303 Merge pull request #7226 from ioito/automated-cherry-pick-of-#7224-upstream-release-3.3
Automated cherry pick of #7224: fix: 过滤可用eip
2020-07-17 20:25:09 +08:00
Zexi Li
94555e348c Merge pull request #7222 from ioito/automated-cherry-pick-of-#7221-upstream-release-3.3
Automated cherry pick of #7221: fix: 避免乌兰察布区域拉取资源异常
2020-07-17 20:24:01 +08:00
Qu Xuan
23e17fe0a1 fix: 过滤可用eip 2020-07-17 20:16:27 +08:00
Qu Xuan
a443975f7e fix: 避免乌兰察布区域拉取资源异常 2020-07-17 18:52:52 +08:00
Zexi Li
5cd0873ee8 Merge pull request #7217 from rainzm/automated-cherry-pick-of-#7216-upstream-release-3.3
Automated cherry pick of #7216: fix: prefetch image error when create guest with vmware template
2020-07-17 10:16:36 +08:00
Zexi Li
7e796affb3 Merge pull request #7214 from tb365/automated-cherry-pick-of-#7213-upstream-release-3.3
Automated cherry pick of #7213: sync classic redis fix
2020-07-17 10:15:48 +08:00
Zexi Li
4b2cb45b0c Merge pull request #7204 from yousong/automated-cherry-pick-of-#7202-upstream-release-3.3
Automated cherry pick of #7202: mcclient: options: loadbalanceragents: yum as the default deploy method
2020-07-17 10:15:10 +08:00
Zexi Li
dde94aa754 Merge pull request #7199 from yousong/automated-cherry-pick-of-#7198-upstream-release-3.3
Automated cherry pick of #7198: ansibleserver: register metadata manager
2020-07-17 10:11:56 +08:00
Zexi Li
771d8b42aa Merge pull request #7196 from ioito/automated-cherry-pick-of-#7195-upstream-release-3.3
Automated cherry pick of #7195: fix: sec rule export missing fields
2020-07-17 10:10:23 +08:00
Zexi Li
544b62c683 Merge pull request #7193 from wanyaoqi/automated-cherry-pick-of-#7192-upstream-release-3.3
Automated cherry pick of #7192: add params auto_migrate_on_host_down
2020-07-17 10:09:09 +08:00
Zexi Li
1c2c0c75f4 Merge pull request #7211 from ioito/automated-cherry-pick-of-#7210-upstream-release-3.3
Automated cherry pick of #7210: fix: not work for network-list --zones
2020-07-17 10:08:15 +08:00
rainzm
4ef5267a85 fix: prefetch image error when create guest with vmware template
1. Only need the corresponding vmware template in the vcenter where the host is
located.
2. Chose storagecache which cacheimage is ready before deploying.
2020-07-16 21:37:14 +08:00
tangbin
30aa75e047 sync classic redis fix 2020-07-16 20:29:20 +08:00
yunion-ci-robot
1b29a59d8f Merge pull request #7203 from zexi/automated-cherry-pick-of-#7201-upstream-release-3.3
Automated cherry pick of #7201: webconsole: fix old session make new session closed
2020-07-16 20:22:18 +08:00
Qu Xuan
d6b83fbbf8 fix: not work for network-list --zones 2020-07-16 19:06:04 +08:00
Yousong Zhou
f30b191d05 region: lbagents: turn off guest src check 2020-07-16 18:50:05 +08:00
Yousong Zhou
4a0d019b6e region: loadbalanceragents: yum as the default method 2020-07-16 18:50:05 +08:00
Yousong Zhou
5218f8aab3 mcclient: options: loadbalanceragents: yum as the default deploy method 2020-07-16 18:50:05 +08:00
Zexi Li
37ee6f8446 webconsole: fix old session make new session closed 2020-07-16 18:49:54 +08:00
Yousong Zhou
e5dd8efd7a build: ansibleserver: use native alpine, include openssh 2020-07-16 18:09:52 +08:00
Yousong Zhou
916943a7c2 ansibleserver: register metadata manager
To quash the following error in log

  [E 200716 15:20:40 db.(*SMetadataResourceBaseModelManager).FetchCustomizeColumns(metadataresource.go:136)] FetchQueryObjectsByIds metadata fail Error 1146: Table 'yunionansible.metadata_tbl' doesn't exist
2020-07-16 18:09:52 +08:00
Qu Xuan
cee24b2a7d fix: sec rule export missing fields 2020-07-16 17:14:17 +08:00