Compare commits

..

1412 Commits

Author SHA1 Message Date
yunion-ci-robot
7f87d4eea5 Merge pull request #5066 from swordqiu/automated-cherry-pick-of-#5065-upstream-release-2.10.0
Automated cherry pick of #5065: fix: allow empty domain for windows deployment
2020-02-10 10:35:56 +08:00
Qiu Jian
a31780bffc fix: allow empty domain for windows deployment 2020-02-10 09:22:40 +08:00
yunion-ci-robot
ccc830abbd Merge pull request #5060 from swordqiu/automated-cherry-pick-of-#5054-upstream-release-2.10.0
Automated cherry pick of #5054: fix: createdAt should not be synced when update
2020-02-09 22:09:58 +08:00
Qiu Jian
5587cded0e fix: createdAt should not be synced when update 2020-02-08 21:31:36 +08:00
yunion-ci-robot
42623c47c8 Merge pull request #5015 from swordqiu/automated-cherry-pick-of-#5014-upstream-release-2.10.0
Automated cherry pick of #5014: fix: support empty dns domain
2020-02-06 09:49:49 +08:00
Qiu Jian
7df7a386d8 fix: support empty dns domain 2020-02-06 03:26:09 +08:00
yunion-ci-robot
789cb16082 Merge pull request #4953 from ioito/automated-cherry-pick-of-#4946-upstream-release-2.10.0
Automated cherry pick of #4946: fix: 腾讯云主机带宽跟随eip带宽变化而变化
2020-01-17 19:43:10 +08:00
Qu Xuan
4212884ab3 fix: 腾讯云主机带宽跟随eip带宽变化而变化 2020-01-17 13:49:11 +08:00
yunion-ci-robot
d118afde9d Merge pull request #4910 from ioito/automated-cherry-pick-of-#4904-upstream-release-2.10.0
Automated cherry pick of #4904: fix: 避免创建azure时指定高级ssd失效
2020-01-16 09:48:06 +08:00
Qu Xuan
5001154665 fix: 避免创建azure时指定高级ssd失效 2020-01-15 18:04:07 +08:00
yunion-ci-robot
7d49e62342 Merge pull request #4855 from ioito/automated-cherry-pick-of-#4849-upstream-release-2.10.0
Automated cherry pick of #4849: fix: aliyun rule fix
2020-01-14 02:19:03 +08:00
Qu Xuan
a1fb63f9f2 fix: aliyun rule fix 2020-01-13 17:46:31 +08:00
yunion-ci-robot
21cb419270 Merge pull request #4790 from yousong/automated-cherry-pick-of-#4784-upstream-release-2.10.0
Automated cherry pick of #4784: dnsrecords: add helper methods
2020-01-10 10:18:00 +08:00
Yousong Zhou
d6e2693d9a dns: chain load records for cname 2020-01-09 23:25:27 +08:00
Yousong Zhou
2937abc329 dns: prepare for responding with A record of cname value 2020-01-09 23:25:27 +08:00
Yousong Zhou
43acb5b2f2 dnsrecords: add helper methods 2020-01-09 23:25:27 +08:00
yunion-ci-robot
7e831feaa1 Merge pull request #4749 from yousong/automated-cherry-pick-of-#4724-upstream-release-2.10.0
Automated cherry pick of #4724: wires: lift name length, charset constraint
2020-01-08 23:41:02 +08:00
Yousong Zhou
a077d0066d wires: lift name length, charset constraint 2020-01-08 19:16:40 +08:00
yunion-ci-robot
ca8a0f59fc Merge pull request #4734 from ioito/automated-cherry-pick-of-#4728-upstream-release-2.10.0
Automated cherry pick of #4728: fix: eip duplicate name
2020-01-08 19:00:57 +08:00
Qu Xuan
4d4964506b fix: eip duplicate name 2020-01-08 18:13:45 +08:00
yunion-ci-robot
0b5d223d5b Merge pull request #4694 from yousong/automated-cherry-pick-of-#4683-upstream-release-2.10.0
Automated cherry pick of #4683: hostman: distro name OpenWrt instead of OpenWRT
2020-01-08 12:53:57 +08:00
Zexi Li
3f67f9e60e Merge pull request #4677 from swordqiu/automated-cherry-pick-of-#4676-upstream-release-2.10.0
Automated cherry pick of #4676: fix: guest network default share scope should be system if non-default-domain-projects is off
2020-01-07 19:30:11 +08:00
Yousong Zhou
a99950173f hostman: openwrt: deploy public key for root 2020-01-07 18:05:27 +08:00
Yousong Zhou
dc4916c3ad hostman: split DeployAuthorizedKeys() 2020-01-07 18:05:27 +08:00
Yousong Zhou
fc7002ba7b hostman: openwrt: support deploy networking scripts 2020-01-07 18:05:27 +08:00
Yousong Zhou
d4f6a384e8 hostman: openwrt: deploy hostname with board config 2020-01-07 18:05:27 +08:00
yunion-ci-robot
2dbfd2b209 Merge pull request #4672 from ioito/automated-cherry-pick-of-#4656-upstream-release-2.10.0
Automated cherry pick of #4656: fix: 避免拥有带宽包的腾讯云创建机器失败
2020-01-07 18:04:57 +08:00
Yousong Zhou
45e9cc958a hostman: also use usb-kbd for openwrt 2020-01-07 18:04:41 +08:00
Yousong Zhou
34743eac7e hostman: distro name OpenWrt instead of OpenWRT 2020-01-07 18:04:26 +08:00
yunion-ci-robot
759334dcc1 Merge pull request #4664 from ioito/automated-cherry-pick-of-#4658-upstream-release-2.10.0
Automated cherry pick of #4658: fix: 避免同步安全组失败后,没有任何日志记录
2020-01-07 17:06:57 +08:00
Qiu Jian
741017dab3 fix: guest network default share scope should be system if non-default-domain-projects is off 2020-01-07 16:50:47 +08:00
Qu Xuan
73aaf6f1d7 fix: 避免拥有带宽包的腾讯云创建机器失败 2020-01-07 16:41:17 +08:00
Qu Xuan
784e265cd7 fix: 避免同步安全组失败后,没有任何日志记录 2020-01-07 11:51:09 +08:00
Zexi Li
c8dd7d0e0d Merge pull request #4615 from ioito/automated-cherry-pick-of-#4609-upstream-release-2.10.0
Automated cherry pick of #4609: fix: 避免仅删除value时,行为演变为删除标签
2020-01-04 23:18:22 +08:00
Qu Xuan
44db08635e fix: 避免仅删除value时,行为演变为删除标签 2020-01-04 22:18:37 +08:00
yunion-ci-robot
405f3e57b7 Merge pull request #4587 from ioito/automated-cherry-pick-of-#4581-upstream-release-2.10.0
Automated cherry pick of #4581: fix: 修复zstack安全组创建失败问题
2020-01-04 20:13:37 +08:00
Qu Xuan
2ffb001aba fix: 修复zstack安全组创建失败问题 2020-01-04 20:03:20 +08:00
Zexi Li
43e3d23e43 Merge pull request #4526 from zexi/automated-cherry-pick-of-#4520-upstream-release-2.10.0
Automated cherry pick of #4520: baremetal: fix megaraid check jbod always disabled
2020-01-03 21:51:41 +08:00
yunion-ci-robot
933b223ca1 Merge pull request #4519 from ioito/automated-cherry-pick-of-#4513-upstream-release-2.10.0
Automated cherry pick of #4513: fix: 腾讯云不支持描述字段参数
2020-01-03 21:33:36 +08:00
Zexi Li
58cdf2a852 baremetal: fix megaraid check jbod always disabled 2020-01-03 21:25:16 +08:00
Qu Xuan
126c16313b fix: 腾讯云不支持描述字段参数 2020-01-03 20:48:19 +08:00
yunion-ci-robot
5344189177 Merge pull request #4468 from yousong/automated-cherry-pick-of-#4464-upstream-release-2.10.0
Automated cherry pick of #4464: networks: 确保外部network也有ifname_hint
2020-01-01 15:30:34 +08:00
Yousong Zhou
85a305e791 networks: 确保外部network也有ifname_hint 2020-01-01 11:54:39 +08:00
yunion-ci-robot
da9b79f526 Merge pull request #4463 from ioito/automated-cherry-pick-of-#4459-upstream-release-2.10.0
Automated cherry pick of #4459: fix: openstack image: vmdk -> qcow2
2020-01-01 09:29:34 +08:00
Qu Xuan
100cd8e3b2 fix: openstack image: vmdk -> qcow2 2019-12-31 19:58:36 +08:00
yunion-ci-robot
68ec08d097 Merge pull request #4449 from wanyaoqi/automated-cherry-pick-of-#4445-upstream-release-2.10.0
Automated cherry pick of #4445: not return on recv packet failed
2019-12-31 17:30:33 +08:00
yunion-ci-robot
e2ef07c679 Merge pull request #4439 from yousong/automated-cherry-pick-of-#4435-upstream-release-2.10.0
Automated cherry pick of #4435: networks: newIfnameHint: 可读性改善
2019-12-31 17:12:32 +08:00
wanyaoqi
5a76023f88 not return on recv packet failed 2019-12-31 17:05:37 +08:00
Yousong Zhou
995d94bffc guestnetworks: 加强ifname内容判断 2019-12-31 14:25:27 +08:00
Yousong Zhou
90a6a36e08 networks: newIfnameHint: 可读性改善 2019-12-31 14:25:27 +08:00
Zexi Li
84fe82d448 Merge pull request #4409 from wanyaoqi/automated-cherry-pick-of-#4405-upstream-release-2.10.0
Automated cherry pick of #4405: fix panic on fstab no content
2019-12-31 00:43:32 +08:00
yunion-ci-robot
50ac1b7deb Merge pull request #4416 from yousong/automated-cherry-pick-of-#4412-upstream-release-2.10.0
Automated cherry pick of #4412: networks: make ifname hint also valid qemu identifier
2019-12-30 18:53:33 +08:00
Yousong Zhou
9c0809fde9 networks: make ifname hint also valid qemu identifier 2019-12-30 18:15:31 +08:00
Zexi Li
f563ff3e16 Merge pull request #4410 from swordqiu/automated-cherry-pick-of-#4401-upstream-release-2.10.0
Automated cherry pick of #4401: fix: host-update ipmi and host-sync-config support
2019-12-30 17:59:23 +08:00
Qiu Jian
ef507126a5 fix: host-update ipmi and host-sync-config support 2019-12-30 16:44:40 +08:00
wanyaoqi
ba921e8b38 fix panic on fstab no content 2019-12-30 16:28:09 +08:00
yunion-ci-robot
e1f19f9c4d Merge pull request #4367 from ioito/automated-cherry-pick-of-#4362-upstream-release-2.10.0
Automated cherry pick of #4362: fix: 更正腾讯云磁盘创建时间
2019-12-29 22:04:39 +08:00
Qu Xuan
796a10d38f fix: 更正腾讯云磁盘创建时间 2019-12-28 13:09:16 +08:00
yunion-ci-robot
1869a05676 Merge pull request #4379 from ioito/automated-cherry-pick-of-#4375-upstream-release-2.10.0
Automated cherry pick of #4375: fix: 避免因太多锁导致删除安全组task失败
2019-12-28 09:53:35 +08:00
Qu Xuan
149586ca13 fix: 避免因太多锁导致删除安全组task失败 2019-12-27 16:24:56 +08:00
Zexi Li
8a734ecf1b Merge pull request #4372 from swordqiu/automated-cherry-pick-of-#4368-upstream-release-2.10.0
Automated cherry pick of #4368: fix: alter user email charset to utf8
2019-12-27 14:29:10 +08:00
Qiu Jian
5268355ef5 fix: alter user email charset to utf8 2019-12-27 14:16:14 +08:00
Zexi Li
410d8face1 Merge pull request #4330 from swordqiu/automated-cherry-pick-of-#4326-upstream-release-2.10.0
Automated cherry pick of #4326: fix: baremetal diskconfig empty adaptor index
2019-12-26 21:16:15 +08:00
yunion-ci-robot
6e81d70595 Merge pull request #4303 from yousong/automated-cherry-pick-of-#4299-upstream-release-2.10.0
Automated cherry pick of #4299: hostman: different error message for different error reason
2019-12-26 11:03:32 +08:00
yunion-ci-robot
ad279dc9db Merge pull request #4311 from ioito/automated-cherry-pick-of-#4307-upstream-release-2.10.0
Automated cherry pick of #4307: fix: 同步openstack宿主机关闭服务后状态
2019-12-26 01:50:14 +08:00
Qiu Jian
307fcda5a3 fix: baremetal diskconfig empty adaptor index 2019-12-26 01:14:45 +08:00
Qu Xuan
14b26e8bc2 fix: 同步openstack宿主机关闭服务后状态 2019-12-25 16:28:56 +08:00
Yousong Zhou
7f4b078f5f hostman: fsdriver: fix hostname deployment for openwrt
We will need to add native uci support later
2019-12-25 16:05:35 +08:00
Yousong Zhou
142e387e32 hostman: add default values for host config 2019-12-25 16:05:35 +08:00
Yousong Zhou
f443c891e8 networks: different indent level for asymmetric branches 2019-12-25 16:05:11 +08:00
Yousong Zhou
a852e49d8e hostman: different error message for different error reason 2019-12-25 16:05:11 +08:00
yunion-ci-robot
b8c8c1ab1f Merge pull request #4216 from yousong/automated-cherry-pick-of-#4212-upstream-release-2.10.0
Automated cherry pick of #4212: guestnetworks: ignore empty preferIfname
2019-12-18 19:00:04 +08:00
Yousong Zhou
9d9ef5da03 guestnetworks: ignore empty preferIfname
Fixes cc02ac74 ("guestnetworks: check ifname uniqueness across different
networks")
2019-12-18 09:19:01 +00:00
yunion-ci-robot
8909cba930 Merge pull request #4200 from ioito/automated-cherry-pick-of-#4194-upstream-release-2.10.0
Automated cherry pick of #4194: fix: 标签过滤和框架保持一致
2019-12-17 16:34:01 +08:00
Qu Xuan
3b1801de0d fix: 标签过滤和框架保持一致 2019-12-17 15:58:38 +08:00
yunion-ci-robot
8cc7c3ee69 Merge pull request #4142 from tb365/automated-cherry-pick-of-#4141-upstream-release-2.10.0
Automated cherry pick of #4141: huawei sync instance offset bugfix
2019-12-14 11:08:59 +08:00
TangBin
9626dae0f5 huawei sync instance offset bugfix 2019-12-13 15:41:31 +08:00
yunion-ci-robot
f5d4f74f81 Merge pull request #4138 from swordqiu/automated-cherry-pick-of-#4134-upstream-release-2.10.0
Automated cherry pick of #4134: fix: misc bugfix for esxi 20191213
2019-12-13 13:00:01 +08:00
yunion-ci-robot
c627a56e6b Merge pull request #4127 from yousong/automated-cherry-pick-of-#4123-upstream-release-2.10.0
Automated cherry pick of #4123: guestnetworks: check ifname uniqueness across different networks
2019-12-13 12:57:01 +08:00
Qiu Jian
30dfca6d2d fix: misc bugfix for esxi 20191213 2019-12-13 12:36:35 +08:00
yunion-ci-robot
e8a96310b4 Merge pull request #4133 from ioito/automated-cherry-pick-of-#4129-upstream-release-2.10.0
Automated cherry pick of #4129: fix: 避免插入时出现duplicate primary key error
2019-12-13 11:37:59 +08:00
Qu Xuan
43dfb4e9c0 fix: 避免插入时出现duplicate primary key error 2019-12-13 10:46:49 +08:00
Yousong Zhou
2b560f39eb guestnetworks: check ifname uniqueness across different networks
With PerformChangeIpAddr, it can happen that a guestnetwork from network
A can take a name that was originally allocated by network B
2019-12-12 15:51:23 +00:00
yunion-ci-robot
1acd980aa0 Merge pull request #4101 from ioito/automated-cherry-pick-of-#4097-upstream-release-2.10.0
Automated cherry pick of #4097: fix: 避免zstack参数含有中文,未编码导致请求失败
2019-12-12 11:01:39 +08:00
Qu Xuan
b9839ea31d fix: 避免zstack参数含有中文,未编码导致请求失败 2019-12-11 23:24:15 +08:00
yunion-ci-robot
c38d80e2b1 Merge pull request #4096 from yousong/automated-cherry-pick-of-#4092-upstream-release-2.10.0
Automated cherry pick of #4092: loadbalancerbackends: janitor: move to InitializeData
2019-12-11 20:13:39 +08:00
Yousong Zhou
8873972837 loadbalancerbackends: janitor: move to InitializeData
The janitor only makes sense when inside region service
2019-12-11 08:26:11 +00:00
yunion-ci-robot
b44344f5ac Merge pull request #4076 from ioito/automated-cherry-pick-of-#4072-upstream-release-2.10.0
Automated cherry pick of #4072: fix: 导出用户标签不加user:前缀
2019-12-11 15:08:38 +08:00
Qu Xuan
e8472c92ac fix: 导出用户标签不加user:前缀 2019-12-09 21:46:45 +08:00
yunion-ci-robot
db2eb20448 Merge pull request #4025 from wanyaoqi/automated-cherry-pick-of-#4021-upstream-release-2.10.0
Automated cherry pick of #4021: add socket used check of deploy server
2019-12-05 14:35:34 +08:00
wanyaoqi
9f567ddcfd add socket used check of deploy server 2019-12-04 11:42:45 +08:00
yunion-ci-robot
3bacfd6d03 Merge pull request #4019 from yousong/automated-cherry-pick-of-#4016-upstream-release-2.10.0
Automated cherry pick of #4016: hostman: hostinfo: turn off report_ignored_msrs
2019-12-04 11:04:34 +08:00
Yousong Zhou
a51aa2d746 hostman: hostinfo: turn off report_ignored_msrs
Quote mainline linux commit fab0aa3b ("KVM: x86: Allow suppressing
prints on RDMSR/WRMSR of unhandled MSRs")

> Some guests use these unhandled MSRs very frequently.
> This cause dmesg to be populated with lots of aggregated messages on
> usage of ignored MSRs. As ignore_msrs=true means that the user is
> well-aware his guest use ignored MSRs, allow to also disable the
> prints on their usage.
>
> An example of such guest is ESXi which tends to access a lot to MSR
> 0x34 (MSR_SMI_COUNT) very frequently.
>
> In addition, we have observed this to cause unnecessary delays to
> guest execution. Such an example is ESXi which experience networking
> delays in it's guests (L2 guests) because of these prints (even when
> prints are rate-limited). This can easily be reproduced by pinging
> from one L2 guest to another.  Once in a while, a peak in ping RTT
> will be observed. Removing these unhandled MSR prints solves the
> issue.
>
> Because these prints can help diagnose issues with guests,
> this commit only suppress them by a module parameter instead of
> removing them from code entirely.
2019-12-04 02:26:50 +00:00
yunion-ci-robot
7d9bae3745 Merge pull request #3962 from wanyaoqi/automated-cherry-pick-of-#3958-upstream-release-2.10.0
Automated cherry pick of #3958: add lock on host detected offline
2019-11-28 14:12:29 +08:00
wanyaoqi
3f28becbf2 add lock on host detected offline 2019-11-28 11:23:42 +08:00
yunion-ci-robot
2507f895cb Merge pull request #3898 from tb365/automated-cherry-pick-of-#3897-upstream-release-2.10.0
Automated cherry pick of #3897: huawei disk detach bugfix
2019-11-27 09:07:27 +08:00
yunion-ci-robot
46e980e76b Merge pull request #3914 from ioito/automated-cherry-pick-of-#3910-upstream-release-2.10.0
Automated cherry pick of #3910: fix: 避免有,Azure更新安全组规则出错
2019-11-27 08:56:28 +08:00
yunion-ci-robot
007b60cb27 Merge pull request #3906 from ioito/automated-cherry-pick-of-#3902-upstream-release-2.10.0
Automated cherry pick of #3902: fix: 普通后台也返回cloudregion_id信息
2019-11-27 08:53:28 +08:00
Qu Xuan
dd6564162f fix: 避免有,Azure更新安全组规则出错 2019-11-26 20:52:08 +08:00
Qu Xuan
275ab78310 fix: 普通后台也返回cloudregion_id信息 2019-11-26 19:14:46 +08:00
TangBin
a3ebacf339 huawei disk detach bugfix 2019-11-26 11:40:18 +08:00
Zexi Li
a4995b2cbf Merge pull request #3888 from swordqiu/automated-cherry-pick-of-#3887-upstream-release-2.10.0
Automated cherry pick of #3887: fix: host-add-netif requires index
2019-11-26 00:43:24 +08:00
Zexi Li
9af81524cb Merge pull request #3883 from swordqiu/automated-cherry-pick-of-#3879-upstream-release-2.10.0
Automated cherry pick of #3879: fix: keystone project resource count not set set to zero
2019-11-26 00:42:00 +08:00
Qiu Jian
b1e7141582 fix: host-add-netif requires index 2019-11-25 23:46:57 +08:00
Qiu Jian
2ad216a77d fix: keystone project resource count not set set to zero 2019-11-25 22:35:46 +08:00
yunion-ci-robot
132365c44e Merge pull request #3872 from ioito/automated-cherry-pick-of-#3868-upstream-release-2.10.0
Automated cherry pick of #3868: fix: 避免openstack重装系统,过不了镜像系统盘大小校验
2019-11-25 17:18:27 +08:00
Qu Xuan
e20e954d73 fix: 避免openstack重装系统,过不了镜像系统盘大小校验 2019-11-25 15:05:12 +08:00
yunion-ci-robot
2e1a8da755 Merge pull request #3867 from zexi/automated-cherry-pick-of-#3863-upstream-release-2.10.0
Automated cherry pick of #3863: baremetal: fix init baremetals fatal exit
2019-11-25 10:21:27 +08:00
Zexi Li
b201a7a007 baremetal: fix init baremetals fatal exit 2019-11-25 09:42:29 +08:00
Zexi Li
a0268d0c3f Merge pull request #3828 from wanyaoqi/automated-cherry-pick-of-#3824-upstream-release-2.10.0
Automated cherry pick of #3824: fix resize disk
2019-11-21 18:22:58 +08:00
wanyaoqi
fc3be951bc fix host register 2019-11-21 18:08:15 +08:00
yunion-ci-robot
8993547c97 Merge pull request #3814 from tb365/automated-cherry-pick-of-#3813-upstream-release-2.10.0
Automated cherry pick of #3813: aws upload image bugfix & huawei change default disk type to SAS
2019-11-21 15:37:26 +08:00
TangBin
ea6b0d9bbc aws upload image bugfix & huawei change default disk type to SAS 2019-11-21 09:34:50 +08:00
wanyaoqi
bef3ec054d fix resize disk 2019-11-20 22:06:52 +08:00
yunion-ci-robot
6e36741bc5 Merge pull request #3792 from yousong/automated-cherry-pick-of-#3788-upstream-release-2.10.0
Automated cherry pick of #3788: lbagent: pidfile: add PidFile
2019-11-19 23:21:22 +08:00
yunion-ci-robot
38735ca704 Merge pull request #3785 from yousong/automated-cherry-pick-of-#3778-upstream-release-2.10.0
Automated cherry pick of #3778: treewide: 避免使用fmt.Print记录日志
2019-11-19 23:15:24 +08:00
Yousong Zhou
9b3efd2482 lbagent: pidfile: remove ReadPidFile() 2019-11-19 12:28:25 +00:00
Yousong Zhou
b660ffa9c5 lbagent: stop daemons: use agentutils.PidFile 2019-11-19 12:28:25 +00:00
Yousong Zhou
62287c6024 lbagent: haproxy: use agentutils.PidFile 2019-11-19 12:28:25 +00:00
Yousong Zhou
0754dd29b1 lbagent: gobetween: use agentutils.PidFile 2019-11-19 12:28:25 +00:00
Yousong Zhou
338c34f65b lbagent: telegraf: use agentutils.PidFile 2019-11-19 12:28:25 +00:00
Yousong Zhou
f996cd09cc lbagent: keepalived: use agentutils.PidFile 2019-11-19 12:28:25 +00:00
Yousong Zhou
6f181f7be9 lbagent: pidfile: add PidFile 2019-11-19 12:28:25 +00:00
Yousong Zhou
5b33b5b709 vendor: update sqlchemy 2019-11-19 12:22:25 +00:00
Yousong Zhou
9dd7cb9c6c treewide: 避免使用fmt.Print记录日志 2019-11-19 12:22:25 +00:00
Yousong Zhou
50b5e4a6da treewide: 将default:"true"的bool字段改为tristate.TriState
使用以下命令进行字段类型更改

	ag 'bool .*`.*default:"true"' pkg \
		| grep models \
		| cut -f1 -d: \
		| xargs sed -i -r -e 's/bool (.*)default:"true"/tristate.TriState \1default:"true"/'

(cherry picked from commit bb1fd0bc59)
2019-11-19 12:22:24 +00:00
Zexi Li
cf9576f439 Merge pull request #3777 from ioito/automated-cherry-pick-of-#3773-upstream-release-2.10.0
Automated cherry pick of #3773: fix: 调整存储容量后刷新调度缓存
2019-11-19 16:10:14 +08:00
Qu Xuan
9969f6d8ad fix: 调整存储容量后刷新调度缓存 2019-11-19 14:35:21 +08:00
Zexi Li
04933e191f Merge pull request #3735 from yousong/automated-cherry-pick-of-#3731-upstream-release-2.10.0
Automated cherry pick of #3731: build: 避免并发构建rpm时触发file exists错误
2019-11-19 10:48:42 +08:00
Yousong Zhou
841dc4c17b build: 避免并发构建rpm时触发file exists错误 2019-11-18 02:45:22 +00:00
yunion-ci-robot
7d9ab4ecac Merge pull request #3720 from ioito/automated-cherry-pick-of-#3699-upstream-release-2.10.0
Automated cherry pick of #3699: fix: cpuCmtbound sync for zstack
2019-11-15 20:21:21 +08:00
Qu Xuan
38984a5e61 fix: cpuCmtbound sync for zstack 2019-11-15 19:08:48 +08:00
yunion-ci-robot
d552648fb6 Merge pull request #3650 from swordqiu/automated-cherry-pick-of-#3649-upstream-release-2.10.0
Automated cherry pick of #3649: fix: agent-list show zone info
2019-11-14 12:38:22 +08:00
yunion-ci-robot
fd2a04a48d Merge pull request #3610 from yousong/automated-cherry-pick-of-#3606-upstream-release-2.10.0
Automated cherry pick of #3606: influxdb: 记录结果中的tags
2019-11-14 00:21:19 +08:00
yunion-ci-robot
92779f44c0 Merge pull request #3640 from ioito/automated-cherry-pick-of-#3636-upstream-release-2.10.0
Automated cherry pick of #3636: fix: 避免associationtype异常
2019-11-14 00:08:25 +08:00
Qiu Jian
e8c1efac55 fix: agent-list show zone info 2019-11-13 23:32:30 +08:00
Qu Xuan
81d5afa4b7 fix: 避免associationtype异常 2019-11-13 19:58:03 +08:00
yunion-ci-robot
002cc5da31 Merge pull request #3635 from ioito/automated-cherry-pick-of-#3631-upstream-release-2.10.0
Automated cherry pick of #3631: fix: 避免匹配到64导致version是6
2019-11-13 19:47:20 +08:00
yunion-ci-robot
dd9a7bfbe3 Merge pull request #3625 from swordqiu/automated-cherry-pick-of-#3621-upstream-release-2.10.0
Automated cherry pick of #3621: fix: nic teaming/bonding not working properly
2019-11-13 17:50:20 +08:00
Qu Xuan
ae0cdfa685 fix: 避免匹配到64导致version是6 2019-11-13 14:53:23 +08:00
Yousong Zhou
6b0cd21679 climc: 添加lblistener{,rule}-backend-status命令 2019-11-13 03:03:51 +00:00
Yousong Zhou
c2821aea07 lblis, lbr: 增加查询后端状态接口 2019-11-13 02:46:38 +00:00
Yousong Zhou
07550e948a lbbackends: 使用yunion.io/pkg/errors 2019-11-13 02:46:38 +00:00
Yousong Zhou
d63ffe5fec influxdb: 记录结果中的tags 2019-11-13 02:46:38 +00:00
Qiu Jian
7b14f7ab7f fix: influxdb write support
(cherry picked from commit b77407c81f)
2019-11-13 02:46:37 +00:00
yunion-ci-robot
05e3266c36 Merge pull request #3615 from wanyaoqi/automated-cherry-pick-of-#3611-upstream-release-2.10.0
Automated cherry pick of #3611: fix resie fs
2019-11-13 01:39:19 +08:00
yunion-ci-robot
3e357543a4 Merge pull request #3619 from yousong/automated-cherry-pick-of-#3523-upstream-release-2.10.0
Automated cherry pick of #3523: lockman: log bug with Errorf
2019-11-13 00:46:19 +08:00
Qiu Jian
2191ae62d6 fix: nic teaming/bonding not working properly 2019-11-13 00:28:14 +08:00
yunion-ci-robot
c1e9b1ba2c Merge pull request #3586 from ioito/automated-cherry-pick-of-#3582-upstream-release-2.10.0
Automated cherry pick of #3582: fix: 避免Openstack越过存储检查
2019-11-12 21:43:33 +08:00
Yousong Zhou
8e67c05b81 vendor: update 2019-11-12 13:33:19 +00:00
Yousong Zhou
e65b6c510c lockman: test multiple lockman 2019-11-12 13:31:13 +00:00
Yousong Zhou
93af604b1d cloudcommon: options: new options for etcd lockman 2019-11-12 13:31:13 +00:00
Yousong Zhou
4d8eb0d167 lockman: distributed lockman with etcd 2019-11-12 13:31:13 +00:00
Yousong Zhou
b79d797963 lockman: log bug with Errorf 2019-11-12 13:31:13 +00:00
wanyaoqi
e5d7b81600 fix resie fs 2019-11-12 21:08:36 +08:00
Qu Xuan
0783ea187d fix: 避免Openstack越过存储检查 2019-11-12 15:19:40 +08:00
yunion-ci-robot
4451c60476 Merge pull request #3561 from tb365/automated-cherry-pick-of-#3558-upstream-release-2.10.0
Automated cherry pick of #3558: huawei disk attach bugfix
2019-11-12 00:33:18 +08:00
tangbin
2da6000a3b huawei disk attach bugfix 2019-11-11 10:30:04 +08:00
yunion-ci-robot
0d9bdd5077 Merge pull request #3531 from zexi/automated-cherry-pick-of-#3528-upstream-release-2.10.0
Automated cherry pick of #3528: webconsole: fix baremetal ipmitool sol payload active on another session
2019-11-08 13:32:15 +08:00
yunion-ci-robot
3d50bef904 Merge pull request #3527 from ioito/automated-cherry-pick-of-#3518-upstream-release-2.10.0
Automated cherry pick of #3518: fix: 虚拟机漂移后设置新的hostId
2019-11-08 11:46:17 +08:00
Zexi Li
1df611a6b8 webconsole: fix baremetal ipmitool sol payload active on another session 2019-11-08 11:36:20 +08:00
Qu Xuan
bdb471e049 fix: 虚拟机漂移后设置新的hostId 2019-11-08 10:52:05 +08:00
yunion-ci-robot
df43601a49 Merge pull request #3517 from ioito/automated-cherry-pick-of-#3492-upstream-release-2.10.0
Automated cherry pick of #3492: fix: 避免version输出不正确
2019-11-08 00:54:17 +08:00
Qu Xuan
713138e6f1 fix: 避免version输出不正确 2019-11-07 17:43:22 +08:00
yunion-ci-robot
215be3fc5e Merge pull request #3483 from tb365/automated-cherry-pick-of-#3478-upstream-release-2.10.0
Automated cherry pick of #3478: region sync fix
2019-11-07 15:08:18 +08:00
TangBin
bb114348ca region sync fix 2019-11-07 12:14:18 +08:00
yunion-ci-robot
4777ab7e9c Merge pull request #3495 from swordqiu/automated-cherry-pick-of-#3494-upstream-release-2.10.0
Automated cherry pick of #3494: fix: skip esxi vm with nil config
2019-11-07 10:19:16 +08:00
yunion-ci-robot
ad0e4eaf49 Merge pull request #3488 from swordqiu/automated-cherry-pick-of-#3487-upstream-release-2.10.0
Automated cherry pick of #3487: fix: nil pointer panic when auth decode body failed
2019-11-07 10:18:18 +08:00
Qiu Jian
132d399747 fix: skip esxi vm with nil config 2019-11-06 22:14:18 +08:00
Qiu Jian
c8265567a2 fix: nil pointer panic when auth decode body failed 2019-11-06 19:41:48 +08:00
yunion-ci-robot
7e2789bfe1 Merge pull request #3471 from yousong/automated-cherry-pick-of-#3468-upstream-release-2.10.0
Automated cherry pick of #3468: azure: fix tmp image file handling
2019-11-06 12:43:14 +08:00
Yousong Zhou
4766bbb570 azure: storagecache: fix writing sparse image file 2019-11-05 09:57:35 +00:00
Yousong Zhou
13edb0ed9e fileutils: add SparseFileWriter 2019-11-05 09:57:35 +00:00
Yousong Zhou
4cc9e080be webconsole: always do session close on pty stop 2019-11-05 09:57:35 +00:00
Yousong Zhou
5da0d93271 seclib2: add doc describing the protocol on removal of tmpfile 2019-11-05 09:15:11 +00:00
Yousong Zhou
d580b89dcc aliyun: fix tmp image file handling 2019-11-05 09:15:11 +00:00
Yousong Zhou
8f5405bd4d azure: fix tmp image file handling 2019-11-05 09:15:11 +00:00
yunion-ci-robot
d686e7ab70 Merge pull request #3446 from ioito/automated-cherry-pick-of-#3428-upstream-release-2.10.0
Automated cherry pick of #3428: fix: 避免创建vmware磁盘快照
2019-11-04 22:44:17 +08:00
Qu Xuan
d4d6c79573 fix: 避免创建vmware磁盘快照 2019-11-04 22:03:56 +08:00
yunion-ci-robot
6be44ab842 Merge pull request #3460 from yousong/automated-cherry-pick-of-#3457-upstream-release-2.10.0
Automated cherry pick of #3457: build: show diffs made by checks
2019-11-04 21:59:14 +08:00
yunion-ci-robot
0508f428e7 Merge pull request #3452 from ioito/automated-cherry-pick-of-#3430-upstream-release-2.10.0
Automated cherry pick of #3430: fix: 标准镜像version
2019-11-04 21:37:16 +08:00
yunion-ci-robot
500562d772 Merge pull request #3449 from ioito/automated-cherry-pick-of-#3429-upstream-release-2.10.0
Automated cherry pick of #3429: fix: 梳理磁盘reset条件
2019-11-04 20:48:14 +08:00
Yousong Zhou
b0e8fec0db build: show diffs made by checks 2019-11-04 07:20:23 +00:00
Qu Xuan
d313e59188 fix: 标准镜像version 2019-11-04 10:21:59 +08:00
Qu Xuan
93749fd449 fix: 梳理磁盘reset条件 2019-11-04 10:19:57 +08:00
Yousong Zhou
6b2913590b Merge pull request #3418 from ioito/automated-cherry-pick-of-#3412-upstream-release-2.10.0
Automated cherry pick of #3412: fix: add latitude for huawei cloud
2019-10-30 21:57:32 +08:00
Qu Xuan
a0d042ec64 fix: add latitude for huawei cloud 2019-10-30 21:31:00 +08:00
yunion-ci-robot
f7cfefcf8b Merge pull request #3401 from wanyaoqi/automated-cherry-pick-of-#3398-upstream-release-2.10.0
Automated cherry pick of #3398: change config add log event
2019-10-29 23:48:11 +08:00
yunion-ci-robot
7355c4ac54 Merge pull request #3404 from ioito/automated-cherry-pick-of-#3363-upstream-release-2.10.0
Automated cherry pick of #3363: fix: 避免虚拟机正常磁盘在回收站
2019-10-28 22:26:09 +08:00
ioito
7f4aa52f0d fix: 避免虚拟机正常磁盘在回收站 2019-10-28 21:56:40 +08:00
yunion-ci-robot
59de7cc3b3 Merge pull request #3377 from yousong/automated-cherry-pick-of-#3374-upstream-release-2.10.0
Automated cherry pick of #3374: lb: 创建时校验不通过返回httperrors
2019-10-28 21:55:09 +08:00
wanyaoqi
6b67da7357 change config add log event 2019-10-28 21:18:04 +08:00
yunion-ci-robot
c884eec18f Merge pull request #3389 from wanyaoqi/automated-cherry-pick-of-#3386-upstream-release-2.10.0
Automated cherry pick of #3386: support hmp
2019-10-28 20:05:10 +08:00
wanyaoqi
4a1512cfbe support hmp 2019-10-28 19:06:32 +08:00
yunion-ci-robot
9ad7917326 Merge pull request #3384 from yousong/automated-cherry-pick-of-#3381-upstream-release-2.10.0
Automated cherry pick of #3381: .circleci: yunionio/onecloud-ci: bump golang version to 1.13.3
2019-10-28 15:46:10 +08:00
Yousong Zhou
825e3f856c goimports: first run 2019-10-28 06:33:32 +00:00
Yousong Zhou
b04f29999d build: add goimports-check 2019-10-28 06:31:21 +00:00
Yousong Zhou
040bc0871d .circleci: use yunionio/onecloud-ci:v1.0.3 2019-10-28 06:31:21 +00:00
Yousong Zhou
dae6c1e806 .circleci: yunionio/onecloud-ci: bundle custom goimports 2019-10-28 06:31:21 +00:00
Yousong Zhou
8ed26af121 .circleci: yunionio/onecloud-ci: run as user "build" 2019-10-28 06:31:21 +00:00
Yousong Zhou
1cd48bb67a .circleci: yunionio/onecloud-ci: bump golang version to 1.13.3 2019-10-28 06:31:21 +00:00
Yousong Zhou
fbd6ddb9f6 cloudcommon: db: 允许普通用户获得pending_deleted字段
Convenient for testing
2019-10-28 02:33:33 +00:00
yunion-ci-robot
dcb73eacf9 Merge pull request #3371 from swordqiu/automated-cherry-pick-of-#3370-upstream-release-2.10.0
Automated cherry pick of #3370: fix: host-wire-update param rename
2019-10-28 09:43:11 +08:00
Qiu Jian
af2bb3e193 fix: hostwire update user network name as wireId 2019-10-27 14:22:12 +08:00
Qiu Jian
7ea1595ba1 fix: host-wire-update param rename 2019-10-27 14:22:12 +08:00
yunion-ci-robot
382f2e66e1 Merge pull request #3350 from ioito/automated-cherry-pick-of-#3347-upstream-release-2.10.0
Automated cherry pick of #3347: fix: 更正stoping状态
2019-10-24 14:12:06 +08:00
ioito
dedbe210f7 fix: 更正stoping状态 2019-10-24 10:55:48 +08:00
yunion-ci-robot
5a01740249 Merge pull request #3333 from swordqiu/automated-cherry-pick-of-#3332-upstream-release-2.10.0
Automated cherry pick of #3332: fix: allow multi-guest-dhcp
2019-10-24 10:46:08 +08:00
yunion-ci-robot
cd13d2b7b0 Merge pull request #3346 from ioito/automated-cherry-pick-of-#3343-upstream-release-2.10.0
Automated cherry pick of #3343: fix: 避免update存储tag信息异常
2019-10-24 07:48:05 +08:00
yunion-ci-robot
801cbd295b Merge pull request #3339 from yousong/automated-cherry-pick-of-#3336-upstream-release-2.10.0
Automated cherry pick of #3336: dns: 添加k8s_skip选项
2019-10-24 07:31:05 +08:00
yunion-ci-robot
507eaf30ee Merge pull request #3328 from ioito/automated-cherry-pick-of-#3325-upstream-release-2.10.0
Automated cherry pick of #3325: fix: 避免解绑eip更新状态不及时导致再次同步出现public ip问题
2019-10-24 01:58:05 +08:00
Qiu Jian
f3da447cad fix: allow multi-guest-dhcp 2019-10-24 01:09:18 +08:00
ioito
e9d67dc886 fix: 避免update存储tag信息异常 2019-10-23 20:56:23 +08:00
Yousong Zhou
1c604fbb77 dns: 添加k8s_skip选项 2019-10-23 08:45:41 +00:00
ioito
4a57706ef7 fix: 避免解绑eip更新状态不及时导致再次同步出现public ip问题 2019-10-22 21:58:45 +08:00
yunion-ci-robot
94437116b3 Merge pull request #3308 from ioito/bugfix/qx-ucloud-secgroup
fix: 修复2.10.0 ucloud安全组同步问题
2019-10-22 10:58:06 +08:00
ioito
2559f5eff8 fix: 修复2.10.0 ucloud安全组同步问题 2019-10-22 10:06:51 +08:00
yunion-ci-robot
4033ac6ddc Merge pull request #3304 from ioito/automated-cherry-pick-of-#3301-upstream-release-2.10.0
Automated cherry pick of #3301: fix: 修复华为云ucloud安全组同步问题
2019-10-22 02:27:04 +08:00
ioito
3b14d0fecd fix: 修复华为云ucloud安全组同步问题 2019-10-21 13:00:33 +08:00
yunion-ci-robot
2ce15ebf50 Merge pull request #3298 from swordqiu/automated-cherry-pick-of-#3297-upstream-release-2.10.0
Automated cherry pick of #3297: fix: esxi change vm instance type always timeout
2019-10-21 09:31:04 +08:00
Qiu Jian
2924c65e35 fix: esxi change vm instance type always timeout 2019-10-21 01:30:02 +08:00
yunion-ci-robot
d697cfd365 Merge pull request #3286 from yousong/automated-cherry-pick-of-#3283-upstream-release-2.10.0
Automated cherry pick of #3283: lbagent: fix listing filter on manager_id
2019-10-18 20:14:02 +08:00
Yousong Zhou
88e0b29400 lbagent: fix listing filter on manager_id 2019-10-18 06:18:02 +00:00
yunion-ci-robot
efa2eaee46 Merge pull request #3277 from wanyaoqi/automated-cherry-pick-of-#3270-upstream-release-2.10.0
Automated cherry pick of #3270: fix reserved memory is zero
2019-10-17 21:40:04 +08:00
wanyaoqi
ccaa315756 fix reserved memory is zero 2019-10-17 15:19:41 +08:00
yunion-ci-robot
10e30916e0 Merge pull request #3267 from ioito/automated-cherry-pick-of-#3264-upstream-release-2.10.0
Automated cherry pick of #3264: fix: 避免返回nil, nil
2019-10-16 20:33:05 +08:00
ioito
8f8c3f4d04 fix: 避免返回nil, nil 2019-10-16 18:13:29 +08:00
Zexi Li
6874d86cd3 Merge pull request #3254 from zexi/automated-cherry-pick-of-#3253-upstream-release-2.10.0
Automated cherry pick of #3253: baremetal: fix stop task hang
2019-10-16 11:51:01 +08:00
Zexi Li
701b2cb2e0 baremetal: fix stop task hang 2019-10-16 11:49:22 +08:00
yunion-ci-robot
df473ef3ae Merge pull request #3234 from ioito/automated-cherry-pick-of-#3231-upstream-release-2.10.0
Automated cherry pick of #3231: fix: 避免删除azure失败
2019-10-15 21:11:01 +08:00
Zexi Li
d07af12583 Merge pull request #3239 from zexi/automated-cherry-pick-of-#3236-upstream-release-2.10.0
Automated cherry pick of #3236: scheduler: adjust skip network filter condition
2019-10-15 16:24:10 +08:00
Zexi Li
1248b75def scheduler: adjust skip network filter condition 2019-10-15 16:23:35 +08:00
yunion-ci-robot
cf1edeb63f Merge pull request #3229 from ioito/automated-cherry-pick-of-#3189-upstream-release-2.10.0
Automated cherry pick of #3189: fix: openstack上传镜像时也指定os_type及额外信息
2019-10-15 16:13:02 +08:00
ioito
b4dcc1d43d fix: 避免删除azure失败 2019-10-15 15:18:38 +08:00
ioito
78b6be546c fix: openstack上传镜像时也指定os_type及额外信息 2019-10-15 10:44:00 +08:00
yunion-ci-robot
9759511206 Merge pull request #3204 from tb365/automated-cherry-pick-of-#3200-upstream-release-2.10.0
Automated cherry pick of #3200: huawei & aws bugfix
2019-10-14 11:59:40 +08:00
yunion-ci-robot
705c21d6cf Merge pull request #3193 from ioito/automated-cherry-pick-of-#3190-upstream-release-2.10.0
Automated cherry pick of #3190: fix: 创建相同配置时返回正确的eip信息
2019-10-14 07:41:41 +08:00
yunion-ci-robot
797b09b778 Merge pull request #3183 from ioito/automated-cherry-pick-of-#3180-upstream-release-2.10.0
Automated cherry pick of #3180: fix: 避免公有云账号统计虚拟的host数量
2019-10-14 07:40:41 +08:00
TangBin
e60b067372 huawei & aws bugfix 2019-10-12 18:14:34 +08:00
ioito
a1fee12739 fix: 创建相同配置时返回正确的eip信息 2019-10-12 16:53:14 +08:00
ioito
2c5131c619 fix: 避免公有云账号统计虚拟的host数量 2019-10-12 11:43:56 +08:00
yunion-ci-robot
87581f827e Merge pull request #3157 from yousong/automated-cherry-pick-of-#3154-upstream-release-2.10.0
Automated cherry pick of #3154: ansibleserver: enable tenant/user cache manager
2019-10-12 10:08:40 +08:00
yunion-ci-robot
43860da561 Merge pull request #3170 from swordqiu/automated-cherry-pick-of-#3169-upstream-release-2.10.0
Automated cherry pick of #3169: fix: string2scope ignore user scope
2019-10-12 10:07:41 +08:00
yunion-ci-robot
f8fbdf3b36 Merge pull request #3176 from yousong/automated-cherry-pick-of-#3173-upstream-release-2.10.0
Automated cherry pick of #3173: hostman: system_service: add IsEnabled() support
2019-10-12 10:05:39 +08:00
Yousong Zhou
932f8645b2 hostman: ensure openvswitch won't automatically start at boot 2019-10-11 15:58:50 +00:00
Yousong Zhou
0026f68ea9 hostman: system_service: add IsEnabled() support 2019-10-11 15:58:50 +00:00
yunion-ci-robot
480b87a86b Merge pull request #3166 from swordqiu/automated-cherry-pick-of-#3165-upstream-release-2.10.0
Automated cherry pick of #3165: fix: skip services without project resources when fetching project resources
2019-10-11 23:52:44 +08:00
Qiu Jian
46e8f105f5 fix: string2scope ignore user scope 2019-10-11 22:08:52 +08:00
Qiu Jian
a10e24a3c4 fix: skip services without project resources when fetching project resources 2019-10-11 18:13:14 +08:00
yunion-ci-robot
1934ac80f3 Merge pull request #3137 from swordqiu/automated-cherry-pick-of-#3136-upstream-release-2.10.0
Automated cherry pick of #3136: fix: guest create eip quota check use owner quota
2019-10-11 14:45:39 +08:00
yunion-ci-robot
69a2eec77e Merge pull request #3153 from yousong/automated-cherry-pick-of-#3150-upstream-release-2.10.0
Automated cherry pick of #3150: hostman: ovs: implement PersistentMAC()
2019-10-10 19:29:40 +08:00
Yousong Zhou
7acc82e449 ansibleserver: enable tenant/user cache manager 2019-10-10 08:11:54 +00:00
Yousong Zhou
4b97937cfd hostman: ovs: implement PersistentMAC()
This is required if phy port was not added as first member or macaddr of
phy port is "locally managed"

More importantly, it needs to be fixed
2019-10-10 08:07:57 +00:00
Zexi Li
2375de8846 Merge pull request #3146 from zexi/automated-cherry-pick-of-#3145-upstream-release-2.10.0
Automated cherry pick of #3145: scheduler: fix not setSchedPendingUsage condition
2019-10-10 10:50:34 +08:00
Zexi Li
ba66d3cd84 scheduler: fix not setSchedPendingUsage condition 2019-10-10 10:50:13 +08:00
Zexi Li
17c24a58b0 Merge pull request #3142 from zexi/automated-cherry-pick-of-#3141-upstream-release-2.10.0
Automated cherry pick of #3141: fix: scheduler specfied network no errors
2019-10-09 21:11:28 +08:00
Zexi Li
ff836e3eea fix: scheduler specfied network no errors 2019-10-09 21:10:39 +08:00
Qiu Jian
18753f8291 fix: guest create eip quota check use owner quota 2019-10-09 17:38:24 +08:00
yunion-ci-robot
3d050196a8 Merge pull request #3124 from zexi/automated-cherry-pick-of-#3121-upstream-release-2.10.0
Automated cherry pick of #3121: scheduler: fix random network domain not matched
2019-10-07 12:59:36 +08:00
Zexi Li
e72d95410d scheduler: fix random network domain not matched 2019-10-07 12:06:31 +08:00
yunion-ci-robot
f4915a90d1 Merge pull request #3118 from zexi/automated-cherry-pick-of-#3117-upstream-release-2.10.0
Automated cherry pick of #3117: scheduler: set random network filter default scope domain
2019-10-06 19:54:36 +08:00
Zexi Li
ae5c05cc95 scheduler: set random network filter default scope domain 2019-10-06 10:35:21 +08:00
yunion-ci-robot
833a6b0eaf Merge pull request #3112 from swordqiu/automated-cherry-pick-of-#3111-upstream-release-2.10.0
Automated cherry pick of #3111: fix: snapsho realdelete nil pointer panic
2019-10-05 07:36:35 +08:00
Qiu Jian
ea869ee61a fix: snapsho realdelete nil pointer panic 2019-10-04 00:10:13 +08:00
yunion-ci-robot
507376fa75 Merge pull request #3107 from swordqiu/automated-cherry-pick-of-#3106-upstream-release-2.10.0
Automated cherry pick of #3106: fix: server-create allow create server with empty disk
2019-09-29 19:33:32 +08:00
Qiu Jian
b593126425 fix: server-create allow create server with empty disk 2019-09-29 17:11:37 +08:00
Zexi Li
fb91090c03 Merge pull request #3101 from zexi/automated-cherry-pick-of-#3098-upstream-release-2.10.0
Automated cherry pick of #3098: scheduler: refactor network_predicate filter
2019-09-29 13:17:15 +08:00
Zexi Li
1af00f5697 scheduler: refactor network_predicate filter 2019-09-28 18:30:34 +08:00
yunion-ci-robot
303f17d369 Merge pull request #3092 from swordqiu/automated-cherry-pick-of-#3091-upstream-release-2.10.0
Automated cherry pick of #3091: fix: reduce policy sync worker queue size
2019-09-28 11:31:33 +08:00
yunion-ci-robot
e963a5b0f8 Merge pull request #3090 from wanyaoqi/automated-cherry-pick-of-#3087-upstream-release-2.10.0
Automated cherry pick of #3087: fix snaphot task complete
2019-09-28 10:50:31 +08:00
Qiu Jian
5e29f892ea fix: reduce policy sync worker queue size 2019-09-27 23:03:45 +08:00
wanyaoqi
d76458f62f fix snaphot task complete 2019-09-27 19:18:03 +08:00
yunion-ci-robot
4e62bca5bd Merge pull request #3063 from yousong/automated-cherry-pick-of-#3059-upstream-release-2.10.0
Automated cherry pick of #3059: guestnetworks: IsExit()减少一次数据库查询
2019-09-27 08:52:30 +08:00
yunion-ci-robot
dddf4d3e7a Merge pull request #3047 from swordqiu/automated-cherry-pick-of-#3046-upstream-release-2.10.0
Automated cherry pick of #3046: fix: keystone panic on invalid auth token
2019-09-27 08:51:30 +08:00
yunion-ci-robot
93cccd92b5 Merge pull request #3074 from wanyaoqi/automated-cherry-pick-of-#3071-upstream-release-2.10.0
Automated cherry pick of #3071: windows format fs fast
2019-09-27 08:50:31 +08:00
yunion-ci-robot
7e73833808 Merge pull request #3070 from wanyaoqi/automated-cherry-pick-of-#3067-upstream-release-2.10.0
Automated cherry pick of #3067: snapshot move to recycle bin
2019-09-26 23:44:31 +08:00
wanyaoqi
cc44e52d23 windows format fs fast 2019-09-26 22:57:54 +08:00
wanyaoqi
d641d3c9cf snapshot move to recycle bin 2019-09-26 22:35:08 +08:00
Yousong Zhou
1392f356c6 guests: list details with nics details 2019-09-26 04:46:08 +00:00
Yousong Zhou
7290d71b1d guestnetworks: IsExit()减少一次数据库查询 2019-09-26 04:46:08 +00:00
yunion-ci-robot
a97a80229a Merge pull request #3042 from yousong/automated-cherry-pick-of-#3039-upstream-release-2.10.0
Automated cherry pick of #3039: lbagents: 添加部署和下线操作记录
2019-09-25 21:26:28 +08:00
Qiu Jian
a22afc5692 fix: keystone panic on invalid auth token 2019-09-25 21:02:37 +08:00
yunion-ci-robot
3edbf06621 Merge pull request #3038 from ioito/automated-cherry-pick-of-#3035-upstream-release-2.10.0
Automated cherry pick of #3035: add: lb vpc info
2019-09-25 13:33:28 +08:00
Yousong Zhou
91cf8bd65c lbagents: 添加部署和下线操作记录 2019-09-25 05:28:02 +00:00
ioito
71a49b0975 add: lb vpc info 2019-09-25 11:49:52 +08:00
yunion-ci-robot
31defde055 Merge pull request #3019 from wanyaoqi/automated-cherry-pick-of-#3004-upstream-release-2.10.0
Automated cherry pick of #3004: fix rbd disk delete rebuild root with snapshot
2019-09-24 20:50:32 +08:00
Yousong Zhou
26e84cedb8 Merge pull request #3016 from yousong/automated-cherry-pick-of-#3010-upstream-release-2.10.0
Automated cherry pick of #3010: lbagents: 禁止在公有云、托管物理机上部署
2019-09-24 10:31:24 +08:00
yunion-ci-robot
1f994e818b Merge pull request #3013 from yousong/automated-cherry-pick-of-#3009-upstream-release-2.10.0
Automated cherry pick of #3009: ansibleserver: 避免数据库故障引起内部状态不一致
2019-09-24 00:50:29 +08:00
wanyaoqi
2290223ba8 fix rbd disk delete rebuild root with snapshot 2019-09-23 22:48:18 +08:00
Yousong Zhou
2999930e43 lbagents: 禁止在公有云、托管物理机上部署 2019-09-23 11:45:54 +00:00
Yousong Zhou
c931a03581 ansibleserver: 避免数据库故障引起内部状态不一致 2019-09-23 11:44:07 +00:00
yunion-ci-robot
fb7ede5938 Merge pull request #3006 from swordqiu/automated-cherry-pick-of-#3005-upstream-release-2.10.0
Automated cherry pick of #3005: fix: tenant filter fail to work
2019-09-21 20:42:28 +08:00
Qiu Jian
969b49bd70 fix: tenant filter fail to work 2019-09-21 20:38:37 +08:00
yunion-ci-robot
223b19782f Merge pull request #2999 from swordqiu/automated-cherry-pick-of-#2998-upstream-release-2.10.0
Automated cherry pick of #2998: fix: adjust default process timeout to 1 minute (previously 15 seconds)
2019-09-19 22:02:28 +08:00
yunion-ci-robot
9edae7f561 Merge pull request #2995 from swordqiu/automated-cherry-pick-of-#2994-upstream-release-2.10.0
Automated cherry pick of #2994: fix: fail to search opslog by obj_name
2019-09-19 22:00:28 +08:00
yunion-ci-robot
355d7e7144 Merge pull request #2964 from wanyaoqi/automated-cherry-pick-of-#2956-upstream-release-2.10.0
Automated cherry pick of #2956: misc fix
2019-09-19 21:22:24 +08:00
yunion-ci-robot
4b019b9e45 Merge pull request #2987 from yousong/automated-cherry-pick-of-#2984-upstream-release-2.10.0
Automated cherry pick of #2984: lbbackends: 改进错误信息传递
2019-09-19 21:12:28 +08:00
Qiu Jian
369d41f628 fix: adjust default process timeout to 1 minute (previously 15 seconds) 2019-09-19 21:08:04 +08:00
Qiu Jian
52ebd96c01 fix: fail to search opslog by obj_name 2019-09-19 21:02:37 +08:00
Yousong Zhou
330c5ce5b1 lbbackends: 改进错误信息传递 2019-09-19 10:40:44 +00:00
yunion-ci-robot
f3d03d152e Merge pull request #2974 from yousong/automated-cherry-pick-of-#2971-upstream-release-2.10.0
Automated cherry pick of #2971: validators: 应对"listener"参数被重复Validate的情况
2019-09-18 23:43:27 +08:00
Yousong Zhou
c3a671591b validators: 应对"listener"参数被重复Validate的情况
Fixes e4ef23515f ("aws elb support")
2019-09-18 07:37:57 +00:00
yunion-ci-robot
4a016a3471 Merge pull request #2967 from swordqiu/automated-cherry-pick-of-#2966-upstream-release-2.10.0
Automated cherry pick of #2966: fix: missing log audit for updating cloudaccount account credential
2019-09-18 11:30:26 +08:00
yunion-ci-robot
53e16ce887 Merge pull request #2953 from swordqiu/automated-cherry-pick-of-#2952-upstream-release-2.10.0
Automated cherry pick of #2952: fix: Table 'yunionlogger.users_cache_tbl' doesn't exist
2019-09-18 11:29:24 +08:00
Qiu Jian
3dc028419c fix: missing log audit for updating cloudaccount account credential 2019-09-18 00:18:54 +08:00
wanyaoqi
16382bff06 misc fix
- optimize batch create validate
2019-09-17 18:53:00 +08:00
Qiu Jian
c63ef27d95 fix: Table 'yunionlogger.users_cache_tbl' doesn't exist 2019-09-17 13:11:42 +08:00
yunion-ci-robot
c2da0481e5 Merge pull request #2947 from ioito/automated-cherry-pick-of-#2944-upstream-release-2.10.0
Automated cherry pick of #2944: fix: 避免zstack高可用关机失效问题
2019-09-17 11:55:25 +08:00
ioito
838c83257b fix: 避免zstack高可用关机失效问题 2019-09-17 11:33:23 +08:00
yunion-ci-robot
257f596de0 Merge pull request #2941 from swordqiu/automated-cherry-pick-of-#2940-upstream-release-2.10.0
Automated cherry pick of #2940: fix: fail to delete disconnected cloudaccount
2019-09-17 08:48:25 +08:00
yunion-ci-robot
8403b2e2c4 Merge pull request #2937 from swordqiu/automated-cherry-pick-of-#2936-upstream-release-2.10.0
Automated cherry pick of #2936: fix: 1. hpssactl blocks on user input 2. host-add-netif reset nic index 3. init baremetal nics with name enX instead of ethX
2019-09-17 08:47:25 +08:00
yunion-ci-robot
8509623af0 Merge pull request #2935 from yousong/automated-cherry-pick-of-#2932-upstream-release-2.10.0
Automated cherry pick of #2932: lbagents: deploy: check existence of pbId before create/update
2019-09-17 01:46:23 +08:00
Qiu Jian
f159f5235e fix: fail to delete disconnected cloudaccount 2019-09-17 01:44:19 +08:00
yunion-ci-robot
17b1285d15 Merge pull request #2919 from wanyaoqi/automated-cherry-pick-of-#2912-upstream-release-2.10.0
Automated cherry pick of #2912: fix init listen interface
2019-09-17 00:14:24 +08:00
Qiu Jian
397e219a07 fix: baremetal prepare updates nic_info incrementally 2019-09-17 00:06:55 +08:00
Qiu Jian
63d9b94207 fix: 1. hpssactl blocks on user input 2. host-add-netif reset nic index 3. init baremetal nics with name enX instead of ethX 2019-09-17 00:06:55 +08:00
Yousong Zhou
25c4609cf5 ansibleserver: ansibleplaybooks: a way out on status chaos
an apb was in state

 - apb.output has content
 - apb.status == running
 - apb.start_time && apb.end_time both set
 - not present in man.sessions

an impossible state
2019-09-16 14:14:12 +00:00
Yousong Zhou
12383cd07c lbagents: deploy: check existence of pbId before create/update 2019-09-16 14:14:12 +00:00
Zexi Li
a507616254 Merge pull request #2931 from zexi/automated-cherry-pick-of-#2928-upstream-release-2.10.0
Automated cherry pick of #2928: scheduler: fix baremetal disk and storage not match
2019-09-16 20:30:09 +08:00
Zexi Li
716d884295 scheduler: fix baremetal disk and storage not match 2019-09-16 20:29:09 +08:00
yunion-ci-robot
4be5cd531f Merge pull request #2925 from ioito/automated-cherry-pick-of-#2921-upstream-release-2.10.0
Automated cherry pick of #2921: fix: 避免删除不存在的快照出错
2019-09-16 18:57:24 +08:00
ioito
66bdba10d3 fix: 避免删除不存在的快照出错 2019-09-16 17:24:51 +08:00
Zexi Li
889c6d593c Merge pull request #2914 from zexi/automated-cherry-pick-of-#2913-upstream-release-2.10.0
Automated cherry pick of #2913: scheduler: fix disk local backend not select matched storage
2019-09-16 14:44:20 +08:00
wanyaoqi
15190fdd26 fix init listen interface 2019-09-16 14:36:01 +08:00
Zexi Li
19c1dcf498 scheduler: fix disk local backend not select matched storage 2019-09-16 13:52:12 +08:00
yunion-ci-robot
c245214047 Merge pull request #2907 from wanyaoqi/automated-cherry-pick-of-#2904-upstream-release-2.10.0
Automated cherry pick of #2904: set concurrent deploy count
2019-09-12 19:11:22 +08:00
yunion-ci-robot
e1d19bbe80 Merge pull request #2909 from ioito/automated-cherry-pick-of-#2908-upstream-release-2.10.0
Automated cherry pick of #2908: fix: 避免cache raw格式的镜像
2019-09-12 19:10:20 +08:00
ioito
6bded31182 fix: 避免cache raw格式的镜像 2019-09-12 19:08:37 +08:00
wanyaoqi
d67df6beff set concurrent deploy count 2019-09-12 19:04:56 +08:00
yunion-ci-robot
3ecb1f6154 Merge pull request #2903 from ioito/automated-cherry-pick-of-#2900-upstream-release-2.10.0
Automated cherry pick of #2900: fix: update vendor
2019-09-12 18:22:21 +08:00
ioito
1abdbe123e fix: update vendor 2019-09-12 18:18:22 +08:00
yunion-ci-robot
c2791b937a Merge pull request #2899 from ioito/automated-cherry-pick-of-#2896-upstream-release-2.10.0
Automated cherry pick of #2896: fix: avoid nil pointer
2019-09-12 17:18:23 +08:00
yunion-ci-robot
47bcbac1d1 Merge pull request #2895 from ioito/automated-cherry-pick-of-#2892-upstream-release-2.10.0
Automated cherry pick of #2892: fix: update go-ceph vendor
2019-09-12 17:16:21 +08:00
ioito
952a52036d fix: update go-ceph vendor 2019-09-12 16:57:56 +08:00
ioito
6d33c4dc6d fix: avoid nil pointer 2019-09-12 16:52:58 +08:00
yunion-ci-robot
f90ba3d7fa Merge pull request #2891 from ioito/automated-cherry-pick-of-#2885-upstream-release-2.10.0
Automated cherry pick of #2885: fix: go-ceph bugifx
2019-09-12 14:34:21 +08:00
ioito
0ca70e050b fix: go-ceph bugifx 2019-09-12 14:19:43 +08:00
Jian Qiu
6b21fbdf64 fix: 1. specifically baremetal use access ip to manage and listen ip to serve baremetal 2. hot net interface might be attached to multiple wire 2. hack fix: baremetal cannot access glance on management network (#2882) 2019-09-12 13:18:10 +08:00
yunion-ci-robot
7eeed23544 Merge pull request #2878 from wanyaoqi/automated-cherry-pick-of-#2877-upstream-release-2.10.0
Automated cherry pick of #2877: fix glance save form url save md5
2019-09-12 12:02:22 +08:00
wanyaoqi
cf8b6a2eb3 fix glance save form url save md5 2019-09-12 11:07:48 +08:00
yunion-ci-robot
fe850f1468 Merge pull request #2872 from ioito/automated-cherry-pick-of-#2869-upstream-release-2.10.0
Automated cherry pick of #2869: fix: 避免置空description失效
2019-09-11 21:36:19 +08:00
yunion-ci-robot
ff0c8210a7 Merge pull request #2874 from swordqiu/automated-cherry-pick-of-#2873-upstream-release-2.10.0
Automated cherry pick of #2873: fix: fail to update reserved ip notes
2019-09-11 21:31:23 +08:00
Qiu Jian
eb15be24e3 fix: fail to update reserved ip notes 2019-09-11 19:29:32 +08:00
ioito
e6176ee095 fix: 避免置空description失效 2019-09-11 16:18:26 +08:00
yunion-ci-robot
aaf1fafadf Merge pull request #2864 from wanyaoqi/automated-cherry-pick-of-#2861-upstream-release-2.10.0
Automated cherry pick of #2861: misc bugfix
2019-09-11 09:30:20 +08:00
yunion-ci-robot
a23cbed51d Merge pull request #2860 from yousong/automated-cherry-pick-of-#2853-upstream-release-2.10.0
Automated cherry pick of #2853: ansibleserver: 限定Playbook字段长度
2019-09-10 22:48:23 +08:00
wanyaoqi
c1fb04f4bc misc bugfix 2019-09-10 22:36:39 +08:00
yunion-ci-robot
3c5bcec1a7 Merge pull request #2859 from ioito/automated-cherry-pick-of-#2855-upstream-release-2.10.0
Automated cherry pick of #2855: fix: 避免密码登录时使用秘钥认证
2019-09-10 17:48:18 +08:00
yunion-ci-robot
9e1d6b34b0 Merge pull request #2852 from ioito/automated-cherry-pick-of-#2849-upstream-release-2.10.0
Automated cherry pick of #2849: fix: 虚拟机更改项目时,eip同时变更
2019-09-10 17:28:22 +08:00
ioito
39544f6524 fix: 避免密码登录时使用秘钥认证 2019-09-10 17:23:36 +08:00
Yousong Zhou
3776dc9eae ansibleserver: 限定Playbook字段长度
避免进入数据库时被截断产生无效数据
2019-09-10 09:22:24 +00:00
ioito
01ff78a898 fix: 虚拟机更改项目时,eip同时变更 2019-09-10 16:50:08 +08:00
yunion-ci-robot
a2db6bb532 Merge pull request #2839 from swordqiu/automated-cherry-pick-of-#2838-upstream-release-2.10.0
Automated cherry pick of #2838: fix: fail to delete orphane VM in esxi https://kb.vmware.com/s/article/1003742
2019-09-10 15:40:19 +08:00
yunion-ci-robot
e3bed5c306 Merge pull request #2843 from tb365/automated-cherry-pick-of-#2842-upstream-release-2.10.0
Automated cherry pick of #2842: fix ucloud snapshot delete
2019-09-10 15:39:19 +08:00
TangBin
dfb5e9a9b4 totp auth code support multi-domain 2019-09-10 15:29:09 +08:00
TangBin
69140a52c5 fix ucloud snapshot delete 2019-09-10 15:26:01 +08:00
yunion-ci-robot
48dfe2d270 Merge pull request #2833 from wanyaoqi/automated-cherry-pick-of-#2800-upstream-release-2.10.0
Automated cherry pick of #2800: misc deploy fix
2019-09-10 15:18:19 +08:00
wanyaoqi
3370955323 guest misc fix 2019-09-10 10:59:57 +08:00
Qiu Jian
e4e3ed7f02 fix: fail to delete orphane VM in esxi https://kb.vmware.com/s/article/1003742 2019-09-10 10:00:28 +08:00
yunion-ci-robot
727c1ac14a Merge pull request #2826 from ioito/automated-cherry-pick-of-#2823-upstream-release-2.10.0
Automated cherry pick of #2823: fix: 修复安全组关联数量校验不正确问题
2019-09-09 23:34:19 +08:00
yunion-ci-robot
8e766a7d81 Merge pull request #2822 from ioito/automated-cherry-pick-of-#2819-upstream-release-2.10.0
Automated cherry pick of #2819: fix: 避免数据盘顺序也被颠倒
2019-09-09 23:31:18 +08:00
wanyaoqi
b91c050fc6 misc deploy fix 2019-09-09 20:37:46 +08:00
Yousong Zhou
cbe5c340cc Merge pull request #2830 from yousong/automated-cherry-pick-of-#2827-upstream-release-2.10.0
Automated cherry pick of #2827: .circleci: fix requires
2019-09-09 18:41:40 +08:00
Yousong Zhou
a84dc63b7e build: rename cleandocgo to adddocgo 2019-09-09 10:04:41 +00:00
Yousong Zhou
be6ba43a3b .circleci: fix requires 2019-09-09 10:04:41 +00:00
Yousong Zhou
9dbccaccff Merge pull request #2818 from yousong/automated-cherry-pick-of-#2809-upstream-release-2.10.0
Automated cherry pick of #2809: build: 将check与构建部分解耦
2019-09-09 17:53:00 +08:00
ioito
67e776aa71 fix: 修复安全组关联数量校验不正确问题 2019-09-09 16:51:07 +08:00
ioito
d54c392ef7 fix: 避免数据盘顺序也被颠倒 2019-09-09 16:47:05 +08:00
yunion-ci-robot
782db5ab9b Merge pull request #2814 from swordqiu/automated-cherry-pick-of-#2813-upstream-release-2.10.0
Automated cherry pick of #2813: fix: fail to find host ip in virtual console vnic
2019-09-09 16:27:20 +08:00
Yousong Zhou
b119a4b411 .circleci: 构建前check 2019-09-09 07:57:16 +00:00
Yousong Zhou
7d493af405 build: 将check与构建部分解耦 2019-09-09 07:56:05 +00:00
Qiu Jian
9c517f0084 fix: fail to find host ip in virtual console vnic 2019-09-09 15:52:59 +08:00
yunion-ci-robot
a6da70c3a4 Merge pull request #2807 from ioito/automated-cherry-pick-of-#2804-upstream-release-2.10.0
Automated cherry pick of #2804: fix: 避免解绑EIP后释放EIP任务失败
2019-09-09 11:56:21 +08:00
ioito
a898d207c8 fix: 避免解绑EIP后释放EIP任务失败 2019-09-09 11:21:21 +08:00
yunion-ci-robot
5d4bc35499 Merge pull request #2798 from wanyaoqi/automated-cherry-pick-of-#2787-upstream-release-2.10.0
Automated cherry pick of #2787: fix guest manager server struct
2019-09-07 19:30:17 +08:00
yunion-ci-robot
2700f34a96 Merge pull request #2784 from ioito/automated-cherry-pick-of-#2783-upstream-release-2.10.0
Automated cherry pick of #2783: fix: 避免重装系统后同步信息导致磁盘类型都为系统盘
2019-09-07 19:06:17 +08:00
wanyaoqi
56a21aacfe fix guest manager server struct 2019-09-07 19:04:12 +08:00
yunion-ci-robot
ec4b113a99 Merge pull request #2776 from swordqiu/automated-cherry-pick-of-#2775-upstream-release-2.10.0
Automated cherry pick of #2775: fix: 1. nil pointer panic error when accessing resource pool and storagecache 2. support multiple disk format
2019-09-07 17:39:18 +08:00
Qiu Jian
221138421f fix: 1. nil pointer panic error when accessing resource pool and storagecache 2. support multiple disk format 2019-09-07 17:22:05 +08:00
ioito
310a4c9831 fix: 避免重装系统后同步信息导致磁盘类型都为系统盘 2019-09-07 13:38:25 +08:00
yunion-ci-robot
ae0b931c7a Merge pull request #2771 from swordqiu/automated-cherry-pick-of-#2733-upstream-release-2.10.0
Automated cherry pick of #2733: fix: optimize logger query time
2019-09-07 13:02:19 +08:00
Qiu Jian
149e1d0e60 fix: optimize logger query time 2019-09-06 13:39:52 +08:00
yunion-ci-robot
11ed89030f Merge pull request #2769 from ioito/automated-cherry-pick-of-#2766-upstream-release-2.10.0
Automated cherry pick of #2766: fix: 不能无限制追加 application/json
2019-09-06 13:10:16 +08:00
yunion-ci-robot
fcb6856b83 Merge pull request #2765 from yousong/automated-cherry-pick-of-#2762-upstream-release-2.10.0
Automated cherry pick of #2762: lbagents: deploy: 检查服务账号有效性
2019-09-06 11:59:17 +08:00
yunion-ci-robot
a8dbe59838 Merge pull request #2761 from wanyaoqi/automated-cherry-pick-of-#2758-upstream-release-2.10.0
Automated cherry pick of #2758: fix vnc connect, filter qmp event
2019-09-06 11:58:20 +08:00
ioito
a7a84ee410 fix: 不能无限制追加 application/json 2019-09-06 11:49:15 +08:00
Yousong Zhou
a4a5178f6f lbagents: deploy: 检查服务账号有效性 2019-09-05 14:00:38 +00:00
wanyaoqi
1ca907858c fix vnc connect, filter qmp event 2019-09-05 21:02:42 +08:00
yunion-ci-robot
12c2d43c11 Merge pull request #2753 from yousong/automated-cherry-pick-of-#2750-upstream-release-2.10.0
Automated cherry pick of #2750: lbagent: reuse mcclient client session
2019-09-05 19:59:18 +08:00
Yousong Zhou
8db877b9ae lbagent: fix possible out of bound index access 2019-09-05 07:38:57 +00:00
Yousong Zhou
b3c03feb79 lbagent: reuse mcclient client session 2019-09-05 07:38:57 +00:00
Zexi Li
29ae921190 Merge pull request #2726 from zexi/automated-cherry-pick-of-#2723-upstream-release-2.10.0
Automated cherry pick of #2723: region: fix create params cdrom missing
2019-09-03 10:47:06 +08:00
Zexi
c755bf7aaa region: fix create params cdrom missing 2019-09-03 10:46:36 +08:00
yunion-ci-robot
a061d82ffc Merge pull request #2704 from swordqiu/automated-cherry-pick-of-#2703-upstream-release-2.10.0
Automated cherry pick of #2703: fix: guest get host nil pointer panic
2019-09-02 21:40:15 +08:00
yunion-ci-robot
42dd7f32d6 Merge pull request #2708 from zexi/automated-cherry-pick-of-#2707-upstream-release-2.10.0
Automated cherry pick of #2707: scheduler: fix reserved resource out of limit bug
2019-09-02 18:53:16 +08:00
Zexi
1bff32bf78 scheduler: fix reserved resource out of limit bug 2019-09-02 18:40:07 +08:00
Qiu Jian
bc7c021283 fix: guest get host nil pointer panic 2019-09-02 18:19:51 +08:00
yunion-ci-robot
348eb8b59a Merge pull request #2702 from ioito/automated-cherry-pick-of-#2699-upstream-release-2.10.0
Automated cherry pick of #2699: fix: 忽略裸金属器删除条件
2019-09-02 17:24:19 +08:00
ioito
eef58b3339 fix: 忽略裸金属器删除条件 2019-09-02 16:32:33 +08:00
yunion-ci-robot
112c6acfda Merge pull request #2695 from ioito/automated-cherry-pick-of-#2689-upstream-release-2.10.0
Automated cherry pick of #2689: fix: 避免裸金属服务器转宿主机任务失败
2019-09-02 15:57:16 +08:00
ioito
ad271c8767 fix: 避免裸金属服务器转宿主机任务失败 2019-09-02 15:33:41 +08:00
yunion-ci-robot
b6778b1f14 Merge pull request #2686 from wanyaoqi/automated-cherry-pick-of-#2683-upstream-release-2.10.0
Automated cherry pick of #2683: fix glance update mindisk
2019-09-02 15:31:15 +08:00
yunion-ci-robot
e1459946aa Merge pull request #2679 from zexi/automated-cherry-pick-of-#2676-upstream-release-2.10.0
Automated cherry pick of #2676: baremetal: auto prepare when pxe boot
2019-09-02 15:30:17 +08:00
wanyaoqi
ce8402e6e3 fix glance update mindisk 2019-09-02 13:54:17 +08:00
yunion-ci-robot
75393b759a Merge pull request #2666 from swordqiu/automated-cherry-pick-of-#2665-upstream-release-2.10.0
Automated cherry pick of #2665: fix: 1. glance/keystone version handler fix 2. allow run glance as normal user
2019-09-02 13:47:15 +08:00
Zexi
c527410628 baremetal: auto prepare when pxe boot 2019-09-02 11:46:59 +08:00
Qiu Jian
0fb41d79be fix: 1. glance/keystone version handler fix 2. allow run glance as normal user 2019-08-31 11:12:53 +08:00
yunion-ci-robot
6843d569fe Merge pull request #2655 from zhasm/automated-cherry-pick-of-#2652-upstream-release-2.10.0
Automated cherry pick of #2652: 修改 Makefile 获取当前分支的方式
2019-08-30 18:24:15 +08:00
张东亮
5af8b74657 修改 Makefile 获取当前分支的方式 2019-08-30 17:59:19 +08:00
yunion-ci-robot
4cb4ca9a4d Merge pull request #2639 from swordqiu/automated-cherry-pick-of-#2629-upstream-release-2.10.0
Automated cherry pick of #2629: fix: incorrect import path of options pkg
2019-08-30 17:21:13 +08:00
liuxueguo6921
be4ff8f6c6 fix: incorrect import path of options pkg 2019-08-30 16:17:06 +08:00
yunion-ci-robot
748b52266b Merge pull request #2646 from ioito/automated-cherry-pick-of-#2601-upstream-release-2.10.0
Automated cherry pick of #2601: fix: 避免创建磁盘时显示provider disable底下的存储
2019-08-30 16:05:14 +08:00
ioito
23de9b54a5 fix: 避免创建磁盘时显示provider disable底下的存储 2019-08-30 10:56:10 +08:00
yunion-ci-robot
bf304e814c Merge pull request #2637 from wanyaoqi/automated-cherry-pick-of-#2635-upstream-release-2.10.0
Automated cherry pick of #2635: bugfix:
2019-08-29 22:46:13 +08:00
wanyaoqi
4ec934a9a9 bugfix:
- fix guest vnc connect failed on host unsupport ipv6
- fix cirros qemu args conflict with windows
2019-08-29 21:25:16 +08:00
yunion-ci-robot
ee6238a0e2 Merge pull request #2633 from ioito/automated-cherry-pick-of-#2630-upstream-release-2.10.0
Automated cherry pick of #2630: fix: avoid not release pending-usage
2019-08-29 21:00:14 +08:00
ioito
b79fd4fb05 fix: avoid not release pending-usage 2019-08-29 20:30:44 +08:00
yunion-ci-robot
c7a6fcbd18 Merge pull request #2618 from ioito/automated-cherry-pick-of-#2615-upstream-release-2.10.0
Automated cherry pick of #2615: fix: avoid rbd image exist when rebuild-root
2019-08-29 17:32:14 +08:00
yunion-ci-robot
e1f697ccf6 Merge pull request #2623 from ioito/automated-cherry-pick-of-#2620-upstream-release-2.10.0
Automated cherry pick of #2620: hotfix: add aliyun request user-agent
2019-08-29 17:19:12 +08:00
ioito
71476e4eac hotfix: add aliyun request user-agent 2019-08-29 16:38:14 +08:00
ioito
24b4ab752e fix: avoid rbd image exist when rebuild-root 2019-08-29 11:49:57 +08:00
yunion-ci-robot
90330fb75a Merge pull request #2614 from ioito/automated-cherry-pick-of-#2569-upstream-release-2.10.0
Automated cherry pick of #2569: fix: 宿主机下线时,需要将宿主机底下的虚拟机状态设为unknown
2019-08-29 11:24:14 +08:00
ioito
5119eb1dbb fix: 宿主机下线时,需要将宿主机底下的虚拟机状态设为unknown 2019-08-29 10:14:53 +08:00
yunion-ci-robot
730f7f9ee1 Merge pull request #2606 from yousong/automated-cherry-pick-of-#2603-upstream-release-2.10.0
Automated cherry pick of #2603: mcclient: ansibleplaybooks: 注册为v2接口
2019-08-28 22:34:13 +08:00
yunion-ci-robot
653656817d Merge pull request #2591 from yousong/automated-cherry-pick-of-#2588-upstream-release-2.10.0
Automated cherry pick of #2588: lbagents: 详情增加zone信息
2019-08-28 22:32:18 +08:00
Yousong Zhou
131fd25d5c mcclient: ansibleplaybooks: 注册为v2接口 2019-08-28 12:47:46 +00:00
yunion-ci-robot
390fa1ad03 Merge pull request #2549 from ioito/automated-cherry-pick-of-#2546-upstream-release-2.10.0
Automated cherry pick of #2546: fix: 避免host disable时detach磁盘
2019-08-28 15:57:16 +08:00
yunion-ci-robot
013ff8fb1d Merge pull request #2545 from ioito/automated-cherry-pick-of-#2512-upstream-release-2.10.0
Automated cherry pick of #2512: fix: add external perform change-project
2019-08-27 11:13:11 +08:00
Yousong Zhou
ace3bde281 lbagents: 详情增加zone信息 2019-08-27 03:03:32 +00:00
yunion-ci-robot
0fa798d646 Merge pull request #2578 from swordqiu/automated-cherry-pick-of-#2577-upstream-release-2.10.0
Automated cherry pick of #2577: fix: quota-list fail if deleted projects found
2019-08-27 10:08:13 +08:00
yunion-ci-robot
ec8cb242ad Merge pull request #2559 from ioito/automated-cherry-pick-of-#2558-upstream-release-2.10.0
Automated cherry pick of #2558: fix: sync and set secgroup public scope
2019-08-26 22:57:16 +08:00
yunion-ci-robot
7994c6e12b Merge pull request #2576 from yousong/automated-cherry-pick-of-#2573-upstream-release-2.10.0
Automated cherry pick of #2573: policy: 将lb集群相关资源归入系统资源类
2019-08-26 22:55:12 +08:00
yunion-ci-robot
57e6a91619 Merge pull request #2587 from wanyaoqi/automated-cherry-pick-of-#2581-upstream-release-2.10.0
Automated cherry pick of #2581: fix rbd disk delete with snapshot
2019-08-26 22:43:13 +08:00
yunion-ci-robot
17bebbf5fe Merge pull request #2584 from wanyaoqi/automated-cherry-pick-of-#2568-upstream-release-2.10.0
Automated cherry pick of #2568: fix host maintenance
2019-08-26 22:42:13 +08:00
wanyaoqi
9de3d292df fix rbd disk delete with snapshot 2019-08-26 22:13:50 +08:00
wanyaoqi
e8b089a3ef fix host maintenance 2019-08-26 22:08:11 +08:00
Qiu Jian
9b6e849e8c fix: quota-list fail if deleted projects found 2019-08-26 19:06:55 +08:00
yunion-ci-robot
be373afc54 Merge pull request #2421 from zexi/automated-cherry-pick-of-#2415-upstream-release-2.10.0
Automated cherry pick of #2415: webconsole: update aliyun vnc base url and uniq vnc session
2019-08-26 16:30:15 +08:00
Yousong Zhou
01e13b6dab policy: 将lb集群相关资源归入系统资源类 2019-08-26 07:43:52 +00:00
Zexi
13835cb07b webconsole: update aliyun vnc base url and uniq vnc session 2019-08-26 15:42:44 +08:00
yunion-ci-robot
a644f9c2af Merge pull request #2565 from tb365/automated-cherry-pick-of-#2564-upstream-release-2.10.0
Automated cherry pick of #2564: aws disk resize bugfix
2019-08-26 15:26:11 +08:00
TangBin
21823f55f8 aws disk resize bugfix 2019-08-26 14:53:31 +08:00
yunion-ci-robot
89fcc70778 Merge pull request #2540 from swordqiu/automated-cherry-pick-of-#2539-upstream-release-2.10.0
Automated cherry pick of #2539: fix: pending usage not release after failed change config
2019-08-24 18:40:10 +08:00
yunion-ci-robot
424cbcc177 Merge pull request #2532 from swordqiu/automated-cherry-pick-of-#2477-upstream-release-2.10.0
Automated cherry pick of #2477: fix: use policy match weight to override less specific policy
2019-08-24 18:39:10 +08:00
yunion-ci-robot
eac5d1552d Merge pull request #2555 from wanyaoqi/automated-cherry-pick-of-#2552-upstream-release-2.10.0
Automated cherry pick of #2552: guest batch migrate
2019-08-24 17:56:10 +08:00
wanyaoqi
1ec0a0640a guest batch migrate 2019-08-24 17:35:06 +08:00
ioito
28dfcd94fe fix: sync and set secgroup public scope 2019-08-24 17:14:46 +08:00
ioito
4f505f090a fix: 避免host disable时detach磁盘 2019-08-24 13:27:28 +08:00
ioito
ea3b84fdb1 fix: add external perform change-project 2019-08-24 10:13:25 +08:00
Qiu Jian
306f05a7a3 fix: pending usage not release after failed change config 2019-08-23 22:45:06 +08:00
yunion-ci-robot
f5407bc61d Merge pull request #2531 from ioito/automated-cherry-pick-of-#2528-upstream-release-2.10.0
Automated cherry pick of #2528: fix: deploy action not sync guest status in subtask
2019-08-23 21:24:08 +08:00
Qiu Jian
bae9b2939f fix: use policy match weight to override less specific policy 2019-08-23 21:18:13 +08:00
ioito
19ee19b4a0 fix: deploy action not sync guest status in subtask 2019-08-23 21:03:07 +08:00
yunion-ci-robot
1ae85bb17e Merge pull request #2525 from ioito/automated-cherry-pick-of-#2522-upstream-release-2.10.0
Automated cherry pick of #2522: fix: sync status after guest sync conf
2019-08-23 18:04:09 +08:00
ioito
9eabb2df62 fix: sync status after guest sync conf 2019-08-23 17:17:15 +08:00
yunion-ci-robot
2f311a4b1b Merge pull request #2502 from ioito/automated-cherry-pick-of-#2499-upstream-release-2.10.0
Automated cherry pick of #2499: fix: qcloud sync unavailable storages
2019-08-23 10:55:09 +08:00
yunion-ci-robot
d938b0dd25 Merge pull request #2494 from yousong/automated-cherry-pick-of-#2491-upstream-release-2.10.0
Automated cherry pick of #2491: networks: 添加ifname_hint字段
2019-08-23 03:38:10 +08:00
yunion-ci-robot
1e51f5da47 Merge pull request #2514 from zexi/automated-cherry-pick-of-#2513-upstream-release-2.10.0
Automated cherry pick of #2513: scheduler: fix disk or net specify resource id execute schedtag filter
2019-08-23 03:37:14 +08:00
yunion-ci-robot
195e6bdb6f Merge pull request #2498 from yousong/automated-cherry-pick-of-#2495-upstream-release-2.10.0
Automated cherry pick of #2495: appsrv: 反转义path segs
2019-08-23 03:14:08 +08:00
yunion-ci-robot
1a68c9be78 Merge pull request #2488 from tb365/automated-cherry-pick-of-#2487-upstream-release-2.10.0
Automated cherry pick of #2487: huawei & aws bugfix
2019-08-23 03:10:09 +08:00
Zexi
e7af6cc36c scheduler: fix disk or net specify resource id execute schedtag filter 2019-08-22 21:58:49 +08:00
ioito
17da544a84 fix: qcloud sync unavailable storages 2019-08-22 20:37:42 +08:00
Yousong Zhou
c5edb0643f guests: detachnetwork时支持以名字指定network 2019-08-22 08:45:49 +00:00
Yousong Zhou
cba294c571 appsrv: 反转义path segs
支持"climc network-delete 中文"
2019-08-22 08:45:49 +00:00
Yousong Zhou
5e6d0709f9 networks: 添加ifname_hint字段
- 升级部署时,从network.Name初始化
 - 创建时,尝试从network.Name取值,取不到则生成随机值
 - 不允许更新
2019-08-22 08:10:49 +00:00
TangBin
78f05b5812 huawei bugfix 2019-08-22 14:34:16 +08:00
TangBin
390aeb3bb5 huawei & aws bugfix 2019-08-22 14:34:16 +08:00
yunion-ci-robot
381d9dc8fc Merge pull request #2486 from ioito/automated-cherry-pick-of-#2483-upstream-release-2.10.0
Automated cherry pick of #2483: fix: zstack reset passworkd with username
2019-08-22 11:42:08 +08:00
yunion-ci-robot
d7163dfe89 Merge pull request #2480 from ioito/automated-cherry-pick-of-#2451-upstream-release-2.10.0
Automated cherry pick of #2451: bugfix: 避免openstack磁盘扩容成功后未能挂载到虚拟机上
2019-08-22 11:40:07 +08:00
ioito
642bb4ed4b fix: zstack reset passworkd with username 2019-08-22 11:26:28 +08:00
ioito
17a97a7616 bugfix: 避免openstack磁盘扩容成功后未能挂载到虚拟机上 2019-08-22 10:16:55 +08:00
yunion-ci-robot
d9946f73f3 Merge pull request #2474 from swordqiu/automated-cherry-pick-of-#2473-upstream-release-2.10.0
Automated cherry pick of #2473: fix: doamin admin cannot access private networks across domain
2019-08-22 09:48:07 +08:00
yunion-ci-robot
624f6efe66 Merge pull request #2470 from swordqiu/automated-cherry-pick-of-#2469-upstream-release-2.10.0
Automated cherry pick of #2469: fix: disk-resize sync guest status cause deadlock
2019-08-22 09:45:08 +08:00
yunion-ci-robot
ba6c7a3df3 Merge pull request #2466 from swordqiu/automated-cherry-pick-of-#2465-upstream-release-2.10.0
Automated cherry pick of #2465: fix: a join update is allowed if one of the joint models is allowed to update
2019-08-22 09:43:08 +08:00
yunion-ci-robot
14644c8a16 Merge pull request #2453 from tb365/automated-cherry-pick-of-#2452-upstream-release-2.10.0
Automated cherry pick of #2452: add update vm name method
2019-08-22 08:11:08 +08:00
yunion-ci-robot
498febf9fc Merge pull request #2432 from ioito/automated-cherry-pick-of-#2414-upstream-release-2.10.0
Automated cherry pick of #2414: hotfix: 避免上传镜像后,再次获取镜像列表因网络原因导致任务失败
2019-08-22 08:10:07 +08:00
Qiu Jian
5266498afa fix: doamin admin cannot access private networks across domain 2019-08-22 00:26:50 +08:00
Qiu Jian
476f2b98f7 fix: disk-resize sync guest status cause deadlock 2019-08-21 23:58:05 +08:00
Qiu Jian
a3e19b1871 fix: a join update is allowed if one of the joint models is allowed to update 2019-08-21 20:41:11 +08:00
yunion-ci-robot
a9a07e8900 Merge pull request #2458 from zexi/automated-cherry-pick-of-#2457-upstream-release-2.10.0
Automated cherry pick of #2457: region: capability domain public network must equal domain_id
2019-08-21 20:30:08 +08:00
yunion-ci-robot
8e1b8d7715 Merge pull request #2464 from wanyaoqi/automated-cherry-pick-of-#2461-upstream-release-2.10.0
Automated cherry pick of #2461: fix snapshot can't delete
2019-08-21 20:17:09 +08:00
Zexi
a32f12f0af region: capability domain public network must equal domain_id 2019-08-21 19:25:43 +08:00
wanyaoqi
1a4d3cb1b6 fix snapshot can't delete 2019-08-21 19:14:53 +08:00
TangBin
73b2d8222b add update vm name method 2019-08-21 15:44:20 +08:00
yunion-ci-robot
7412181960 Merge pull request #2438 from ioito/automated-cherry-pick-of-#2407-upstream-release-2.10.0
Automated cherry pick of #2407: fix: 避免admin=false时,不显示其余项目下的标签信息
2019-08-21 15:33:08 +08:00
yunion-ci-robot
3057673680 Merge pull request #2450 from zexi/automated-cherry-pick-of-#2447-upstream-release-2.10.0
Automated cherry pick of #2447: scheduler: sku not unmarshal to ServerConfigs
2019-08-21 14:57:08 +08:00
Zexi
4337e80f7d scheduler: sku not unmarshal to ServerConfigs 2019-08-21 12:31:51 +08:00
yunion-ci-robot
03384ed221 Merge pull request #2435 from ioito/automated-cherry-pick-of-#2412-upstream-release-2.10.0
Automated cherry pick of #2412: hotfix: snapshot create optimized
2019-08-21 10:57:08 +08:00
ioito
9784b2e2d9 fix: 避免admin=false时,不显示其余项目下的标签信息 2019-08-21 10:28:07 +08:00
ioito
ee01fddcc2 hotfix: snapshot create optimized 2019-08-21 10:24:21 +08:00
ioito
0dcde6dd04 hotfix: 避免上传镜像后,再次获取镜像列表因网络原因导致任务失败 2019-08-21 10:09:00 +08:00
yunion-ci-robot
fe41dbe8ac Merge pull request #2427 from ioito/automated-cherry-pick-of-#2424-upstream-release-2.10.0
Automated cherry pick of #2424: fix: 允许更改私有云region名称
2019-08-20 23:49:07 +08:00
yunion-ci-robot
9a5a51ae74 Merge pull request #2411 from ioito/automated-cherry-pick-of-#2408-upstream-release-2.10.0
Automated cherry pick of #2408: fix: avoid sku validate delete return error
2019-08-20 23:34:11 +08:00
ioito
1af10a6446 fix: 允许更改私有云region名称 2019-08-20 21:21:20 +08:00
yunion-ci-robot
3e99a2d120 Merge pull request #2383 from zexi/automated-cherry-pick-of-#2382-upstream-release-2.10.0
Automated cherry pick of #2382: baremetal: fix ext4 rootfs inode inconsistent
2019-08-20 21:00:08 +08:00
yunion-ci-robot
e1bac65ede Merge pull request #2420 from wanyaoqi/automated-cherry-pick-of-#2417-upstream-release-2.10.0
Automated cherry pick of #2417: fix snapshot ops log
2019-08-20 20:54:07 +08:00
yunion-ci-robot
fa5c003813 Merge pull request #2403 from swordqiu/automated-cherry-pick-of-#2402-upstream-release-2.10.0
Automated cherry pick of #2402: fix: sysadmin should be a system account
2019-08-20 20:47:08 +08:00
wanyaoqi
778ca34e24 fix snapshot ops log 2019-08-20 20:27:54 +08:00
Zexi
aeb55d8efd baremetal: fix ext4 rootfs inode inconsistent 2019-08-20 17:17:24 +08:00
ioito
5c168cc7d5 fix: avoid sku validate delete return error 2019-08-20 15:26:49 +08:00
Qiu Jian
11bce5202f fix: sysadmin should be a system account 2019-08-20 14:01:53 +08:00
yunion-ci-robot
38bd53cd0c Merge pull request #2395 from swordqiu/automated-cherry-pick-of-#2392-upstream-release-2.10.0
Automated cherry pick of #2392: fix: qcloud change config failed
2019-08-20 11:31:05 +08:00
yunion-ci-robot
b71b743440 Merge pull request #2388 from swordqiu/automated-cherry-pick-of-#2387-upstream-release-2.10.0
Automated cherry pick of #2387: fix: cloud-provider-region add cloudaccount_domain_id
2019-08-20 11:28:07 +08:00
yunion-ci-robot
08084bc67b Merge pull request #2398 from ioito/automated-cherry-pick-of-#2381-upstream-release-2.10.0
Automated cherry pick of #2381: fix: httputils show error when resp body is not dict
2019-08-20 10:25:08 +08:00
ioito
6c91f41e7c fix: httputils show error when resp body is not dict 2019-08-20 10:19:12 +08:00
Qiu Jian
12e8f747d9 fix: qcloud change config failed 2019-08-20 01:51:22 +08:00
yunion-ci-robot
1ed014af66 Merge pull request #2380 from wanyaoqi/automated-cherry-pick-of-#2377-upstream-release-2.10.0
Automated cherry pick of #2377: snapshot bugs fix
2019-08-20 00:05:09 +08:00
Qiu Jian
67c0f4fdc2 fix: cloud-provider-region add cloudaccount_domain_id 2019-08-19 22:26:30 +08:00
wanyaoqi
b6b57c12f7 snapshot bugs fix 2019-08-19 20:34:10 +08:00
yunion-ci-robot
42cef580e6 Merge pull request #2376 from swordqiu/automated-cherry-pick-of-#2373-upstream-release-2.10.0
Automated cherry pick of #2373: fix: not sync correctly aws VM's tempoaral public ip
2019-08-19 10:24:06 +08:00
Qiu Jian
4f84a932d9 fix: not sync correctly aws VM's tempoaral public ip 2019-08-19 02:18:42 +08:00
yunion-ci-robot
176c4b9424 Merge pull request #2370 from swordqiu/automated-cherry-pick-of-#2369-upstream-release-2.10.0
Automated cherry pick of #2369: fix: avoid duplicate image uploading if multiple identical instances created at same time
2019-08-19 00:09:05 +08:00
Qiu Jian
5bef41d64f fix: avoid duplicate image uploading if multiple identical instances created at same time 2019-08-18 23:26:16 +08:00
yunion-ci-robot
1d606ec687 Merge pull request #2366 from swordqiu/automated-cherry-pick-of-#2357-upstream-release-2.10.0
Automated cherry pick of #2357: fix: deprecate old user/group joint project API, create new action apis for add user/group to projects with roles
2019-08-17 21:35:08 +08:00
yunion-ci-robot
43de19835f Merge pull request #2363 from swordqiu/automated-cherry-pick-of-#2362-upstream-release-2.10.0
Automated cherry pick of #2362: fix: cloud-account-usage no data for domain admin
2019-08-17 18:55:05 +08:00
Qiu Jian
2951a0d2ff update vendor 2019-08-17 18:54:07 +08:00
Qiu Jian
11cbaefd3d fix: deprecate old user/group joint project API, create new action apis for add user/group to projects with roles 2019-08-17 18:51:28 +08:00
Qiu Jian
3e7ce5545c fix: cloud-account-usage no data for domain admin 2019-08-17 18:41:13 +08:00
yunion-ci-robot
e9c14e7a45 Merge pull request #2359 from swordqiu/automated-cherry-pick-of-#2358-upstream-release-2.10.0
Automated cherry pick of #2358: fix: new user without porject may view any resources
2019-08-17 18:27:05 +08:00
Qiu Jian
43ff1c3a3d fix: new user without porject may view any resources 2019-08-17 13:41:16 +08:00
yunion-ci-robot
2df8c0cc71 Merge pull request #2356 from yousong/automated-cherry-pick-of-#2353-upstream-release-2.10.0
Automated cherry pick of #2353: Makefile: 改正rpm target
2019-08-17 10:00:06 +08:00
yunion-ci-robot
7cf8fa1cc0 Merge pull request #2346 from yousong/automated-cherry-pick-of-#2343-upstream-release-2.10.0
Automated cherry pick of #2343: hostman: windows: 改正批处理代码
2019-08-17 09:58:06 +08:00
yunion-ci-robot
da952ad714 Merge pull request #2350 from swordqiu/automated-cherry-pick-of-#2349-upstream-release-2.10.0
Automated cherry pick of #2349: fix: project_id/domain_id was cleared after FetchProjectInfo/FetchDomainInfo called
2019-08-16 22:09:08 +08:00
Yousong Zhou
029481c756 .travis.yml: 去掉过时comment 2019-08-16 13:58:43 +00:00
Yousong Zhou
18aa150fdd Makefile: 改正rpm target 2019-08-16 13:58:43 +00:00
Qiu Jian
c88ac909bd fix: project_id/domain_id was cleared after FetchProjectInfo/FetchDomainInfo called 2019-08-16 21:26:00 +08:00
yunion-ci-robot
14f5657a0d Merge pull request #2342 from wanyaoqi/automated-cherry-pick-of-#2339-upstream-release-2.10.0
Automated cherry pick of #2339: fix managered disk reset not update disk size
2019-08-16 21:23:06 +08:00
Yousong Zhou
98e024eeca hostman: windows: 改正批处理代码 2019-08-16 13:21:23 +00:00
wanyaoqi
5dcfa16814 fix managered disk reset not update disk size 2019-08-16 18:02:13 +08:00
yunion-ci-robot
ed6c69b5ef Merge pull request #2333 from tb365/automated-cherry-pick-of-#2332-upstream-release-2.10.0
Automated cherry pick of #2332: aws & huawei & ucloud fix
2019-08-16 17:21:06 +08:00
yunion-ci-robot
41b2c07f3c Merge pull request #2315 from ioito/automated-cherry-pick-of-#2311-upstream-release-2.10.0
Automated cherry pick of #2311: fix: avoid duplicate sku error
2019-08-16 17:11:06 +08:00
yunion-ci-robot
883afa6346 Merge pull request #2304 from wanyaoqi/automated-cherry-pick-of-#2301-upstream-release-2.10.0
Automated cherry pick of #2301: fix image head no field tenant
2019-08-16 17:05:06 +08:00
yunion-ci-robot
2bec03b8af Merge pull request #2290 from wanyaoqi/automated-cherry-pick-of-#2287-upstream-release-2.10.0
Automated cherry pick of #2287: fix ceph rescue mode migrate
2019-08-16 17:04:05 +08:00
TangBin
deafd08ed8 aws & huawei & ucloud fix 2019-08-16 16:50:14 +08:00
yunion-ci-robot
6289bc3ff2 Merge pull request #2329 from ioito/automated-cherry-pick-of-#2326-upstream-release-2.10.0
Automated cherry pick of #2326: fix: azure快照的磁盘id应该小写
2019-08-16 16:29:04 +08:00
yunion-ci-robot
0bea25d9fa Merge pull request #2323 from swordqiu/automated-cherry-pick-of-#2322-upstream-release-2.10.0
Automated cherry pick of #2322: fix: openstack provider string should be OpenStack
2019-08-16 16:28:04 +08:00
yunion-ci-robot
c34aef41a0 Merge pull request #2296 from zexi/automated-cherry-pick-of-#2293-upstream-release-2.10.0
Automated cherry pick of #2293: baremetal: raid disk inode inconsistent due to mkfs.ext4 largefile option
2019-08-16 16:14:05 +08:00
ioito
bdd761f0b9 fix: azure快照的磁盘id应该小写 2019-08-16 15:58:20 +08:00
Qiu Jian
4b4e175428 fix: openstack provider string should be OpenStack 2019-08-16 15:41:30 +08:00
yunion-ci-robot
5791bec28e Merge pull request #2319 from ioito/automated-cherry-pick-of-#2316-upstream-release-2.10.0
Automated cherry pick of #2316: fix: create disk with project-src=local
2019-08-16 15:22:06 +08:00
ioito
18d181718e fix: create disk with project-src=local 2019-08-16 15:04:49 +08:00
ioito
950df5249f fix: avoid duplicate sku error 2019-08-16 14:51:00 +08:00
yunion-ci-robot
a85852c57d Merge pull request #2309 from yousong/automated-cherry-pick-of-#2305-upstream-release-2.10.0
Automated cherry pick of #2305: .travis.yml: 不使用docker
2019-08-16 14:39:07 +08:00
Yousong Zhou
ea373dbfea .travis.yml: 不使用docker 2019-08-16 05:44:24 +00:00
wanyaoqi
57aec6fedb fix image head no field tenant 2019-08-16 12:17:24 +08:00
yunion-ci-robot
e515c07865 Merge pull request #2300 from yousong/automated-cherry-pick-of-#2297-upstream-release-2.10.0
Automated cherry pick of #2297: Makefile: 使用rpm/%
2019-08-16 10:36:05 +08:00
Yousong Zhou
0a874d4af7 .travis.yml: 改正权限问题 2019-08-16 02:21:19 +00:00
Yousong Zhou
8ea2e9812e Makefile: 使用rpm/% 2019-08-16 02:21:19 +00:00
yunion-ci-robot
fbd0e33531 Merge pull request #2275 from yousong/automated-cherry-pick-of-#2272-upstream-release-2.10.0
Automated cherry pick of #2272: .travis.yml: 改正配置
2019-08-15 22:02:04 +08:00
Zexi
17fae7f4f8 baremetal: raid disk inode inconsistent due to mkfs.ext4 largefile option 2019-08-15 21:34:32 +08:00
wanyaoqi
cb4476f007 fix ceph rescue mode migrate 2019-08-15 16:04:55 +08:00
yunion-ci-robot
06f7589df4 Merge pull request #2283 from wanyaoqi/automated-cherry-pick-of-#2280-upstream-release-2.10.0
Automated cherry pick of #2280: add distinct field manager
2019-08-15 10:39:02 +08:00
wanyaoqi
48c39c5354 add distinct field manager 2019-08-14 21:03:20 +08:00
yunion-ci-robot
ff78076839 Merge pull request #2279 from ioito/automated-cherry-pick-of-#2276-upstream-release-2.10.0
Automated cherry pick of #2276: fix: missing setup managerId for snapshot
2019-08-14 20:38:06 +08:00
ioito
235154a3e4 fix: missing setup managerId for snapshot 2019-08-14 20:15:15 +08:00
Yousong Zhou
6aee947b8c Makefile: fail for unknown target 2019-08-14 07:13:12 +00:00
Yousong Zhou
902bd84ec5 .travis.yml: 改正配置
找不到commit

	$ git clone --depth=1 --branch=release/2.11 https://github.com/yunionio/onecloud.git yunionio/onecloud
	Cloning into 'yunionio/onecloud'...
	remote: Enumerating objects: 9016, done.
	remote: Counting objects: 100% (9016/9016), done.
	remote: Compressing objects: 100% (6914/6914), done.
	remote: Total 9016 (delta 2420), reused 5969 (delta 1637), pack-reused 0
	Receiving objects: 100% (9016/9016), 14.37 MiB | 14.29 MiB/s, done.
	Resolving deltas: 100% (2420/2420), done.
	$ cd yunionio/onecloud
	$ git checkout -qf 4e9f605844
	fatal: reference is not a tree: 4e9f605844
	The command "git checkout -qf 4e9f60584434f56a410604b4ef36f979ecdb9623" failed and exited with 128 during .
2019-08-14 07:13:12 +00:00
Yousong Zhou
b44af70fdb Merge pull request #2270 from swordqiu/hotfix/qj-cloud-account-sync-status-stop-at-queuing
fix: cloud account status stop at queuing after mannual sync
2019-08-14 10:22:59 +08:00
Qiu Jian
b73714edf8 fix: cloud account status stop at queuing after mannual sync 2019-08-14 10:09:25 +08:00
Yousong Zhou
7d7612133c Merge pull request #2266 from swordqiu/automated-cherry-pick-of-#2264-upstream-release-2.10.0
Automated cherry pick of #2264: fix: qcloud storagecache bucket name too long
2019-08-14 09:51:18 +08:00
Qiu Jian
298ebab0a9 fix: qcloud storagecache bucket name too long 2019-08-14 00:38:47 +08:00
yunion-ci-robot
07cbcf9d12 Merge pull request #2259 from wanyaoqi/automated-cherry-pick-of-#2257-upstream-release-2.10.0
Automated cherry pick of #2257: fix sku cron job
2019-08-13 21:42:01 +08:00
wanyaoqi
bb01794fc0 fix sku cron job 2019-08-13 21:16:27 +08:00
yunion-ci-robot
f104afc206 Merge pull request #2254 from wanyaoqi/automated-cherry-pick-of-#2250-upstream-release-2.10.0
Automated cherry pick of #2250: support get user tags
2019-08-13 18:55:03 +08:00
yunion-ci-robot
cfd347e09e Merge pull request #2246 from wanyaoqi/automated-cherry-pick-of-#2227-upstream-release-2.10.0
Automated cherry pick of #2227: - feature: refact snapshot related code - feature: rbd snapshot - bugfix: ceph cache iso image - delete disk create snapshot and guest create snapshot - fix auto snapshot - fix disk reset
2019-08-13 18:53:03 +08:00
yunion-ci-robot
6b1878c600 Merge pull request #2253 from zexi/automated-cherry-pick-of-#2249-upstream-release-2.10.0
Automated cherry pick of #2249: baremetal: fix rebuild root no password
2019-08-13 18:35:01 +08:00
wanyaoqi
7a387c2dc6 support get user tags 2019-08-13 18:29:54 +08:00
Zexi
a4e9b38e98 baremetal: fix rebuild root no password 2019-08-13 18:25:33 +08:00
wanyaoqi
0950e68b37 - feature: refact snapshot related code - feature: rbd snapshot - bugfix: ceph cache iso image - delete disk create snapshot and guest create snapshot - fix auto snapshot - fix disk reset 2019-08-13 11:39:08 +08:00
yunion-ci-robot
711bd85227 Merge pull request #2236 from ioito/automated-cherry-pick-of-#2234-upstream-release-2.10.0
Automated cherry pick of #2234: fix: no need to inject password by cloud-init for qcloud
2019-08-12 22:17:06 +08:00
yunion-ci-robot
33941ee95d Merge pull request #2223 from swordqiu/automated-cherry-pick-of-#2222-upstream-release-2.10.0
Automated cherry pick of #2222: fix: when turning off non-default-domain-projects, network public scope should swtich to system scope
2019-08-12 21:57:02 +08:00
ioito
30b9c5ef75 fix: no need to inject password by cloud-init for qcloud 2019-08-12 20:27:41 +08:00
yunion-ci-robot
77c1954267 Merge pull request #2231 from zhasm/automated-cherry-pick-of-#2230-upstream-release-2.10.0
Automated cherry pick of #2230: 对 actionlog 的 tenent_id 字段加索引,提升 actionlog 查询速率
2019-08-12 18:19:02 +08:00
Zhang Dongliang
f2503e1397 对 actionlog 的 tenent_id 字段加索引,提升 actionlog 查询速率 2019-08-12 17:57:24 +08:00
Yousong Zhou
7369d0115f Merge pull request #2204 from ioito/automated-cherry-pick-of-#2202-upstream-release-2.10.0
Automated cherry pick of #2202: fix: sync cloud snapshot size
2019-08-12 13:15:28 +08:00
Qiu Jian
f1ffb294e4 fix: when turning off non-default-domain-projects, network public scope should swtich to system scope 2019-08-12 10:21:05 +08:00
yunion-ci-robot
e78fa8e266 Merge pull request #2220 from zhasm/automated-cherry-pick-of-#2219-upstream-release-2.10.0
Automated cherry pick of #2219: quota-set 新增 secgroup 字段
2019-08-12 09:58:02 +08:00
Zhang Dongliang
aef3d52744 quota-set 新增 secgroup 字段 2019-08-12 09:41:44 +08:00
yunion-ci-robot
c18cd16499 Merge pull request #2213 from yousong/automated-cherry-pick-of-#2211-upstream-release-2.10.0
Automated cherry pick of #2211: lbcluster: 添加wire亲和性质
2019-08-11 14:38:01 +08:00
yunion-ci-robot
818844e7b6 Merge pull request #2218 from yousong/automated-cherry-pick-of-#2216-upstream-release-2.10.0
Automated cherry pick of #2216: circleci: coverage.sh: 改善内存消耗
2019-08-11 14:09:59 +08:00
Yousong Zhou
49b2f07a05 circleci: coverage.sh: 改善内存消耗 2019-08-10 18:37:10 +00:00
Yousong Zhou
dc04a24574 lbcluster: 限定仅管理员可操作 2019-08-10 10:29:05 +00:00
Yousong Zhou
423cb11657 lbcluster: lbcluster-list支持--wire, --zone过滤 2019-08-10 10:29:05 +00:00
Yousong Zhou
a5e797ea37 lbcluster: 添加wire亲和性质 2019-08-10 10:29:05 +00:00
ioito
c671bb5159 fix: sync cloud snapshot size 2019-08-10 16:33:34 +08:00
yunion-ci-robot
017d1c8848 Merge pull request #2201 from yousong/automated-cherry-pick-of-#2199-upstream-release-2.10.0
Automated cherry pick of #2199: vendor: update structarg
2019-08-09 20:03:00 +08:00
Yousong Zhou
ca3223373f climc: 去掉help string中关于choice的内容 2019-08-09 11:09:44 +00:00
Yousong Zhou
1f3646e834 vendor: update structarg 2019-08-09 11:09:44 +00:00
yunion-ci-robot
07bff256c3 Merge pull request #2194 from swordqiu/automated-cherry-pick-of-#2193-upstream-release-2.10.0
Automated cherry pick of #2193: fix: imported esxi VM fail to rebuild root
2019-08-09 09:51:59 +08:00
Qiu Jian
4176a640aa fix: imported esxi VM fail to rebuild root 2019-08-09 01:01:57 +08:00
yunion-ci-robot
223580c6b0 Merge pull request #2187 from ioito/automated-cherry-pick-of-#2186-upstream-release-2.10.0
Automated cherry pick of #2186: fix: lb purge error
2019-08-08 20:06:58 +08:00
ioito
b660e1005e fix: lb purge error 2019-08-08 19:52:09 +08:00
yunion-ci-robot
a74479238a Merge pull request #2183 from tb365/automated-cherry-pick-of-#2181-upstream-release-2.10.0
Automated cherry pick of #2181: cpu core bugfix
2019-08-08 19:49:59 +08:00
TangBin
1a61b48259 cpu core bugfix 2019-08-08 19:38:25 +08:00
yunion-ci-robot
10eadab6dc Merge pull request #2173 from ioito/automated-cherry-pick-of-#2161-upstream-release-2.10.0
Automated cherry pick of #2161: hotfix: sync openstack cup and memory cmtbound
2019-08-08 16:52:58 +08:00
yunion-ci-robot
5df802b58f Merge pull request #2177 from zhasm/automated-cherry-pick-of-#2176-upstream-release-2.10.0
Automated cherry pick of #2176: hotfix: 将 websocket 的 broadcast 接口里 topic 这个必选变量设为位置参数; 其他参数给了默认值,非必填
2019-08-08 16:21:58 +08:00
yunion-ci-robot
6d073c50ff Merge pull request #2164 from wanyaoqi/automated-cherry-pick-of-#2162-upstream-release-2.10.0
Automated cherry pick of #2162: server migrate to different mountpoint storage
2019-08-08 16:15:59 +08:00
Zhang Dongliang
b847fadb31 hotfix: 将 websocket 的 broadcast 接口里 topic 这个必选变量设为位置参数; 其他参数给了默认值,非必填 2019-08-08 15:55:46 +08:00
yunion-ci-robot
2976356bae Merge pull request #2168 from yousong/automated-cherry-pick-of-#2146-upstream-release-2.10.0
Automated cherry pick of #2146: climc: add --output-format support
2019-08-08 15:47:58 +08:00
ioito
190b0fd2cb hotfix: sync openstack cup and memory cmtbound 2019-08-08 11:21:02 +08:00
Yousong Zhou
f233074e29 climc: add --output-format support 2019-08-08 01:51:50 +00:00
wanyaoqi
767a0087fd server migrate to different mountpoint storage 2019-08-07 21:14:48 +08:00
yunion-ci-robot
f35a358980 Merge pull request #2154 from yousong/automated-cherry-pick-of-#2152-upstream-release-2.10.0
Automated cherry pick of #2152: lbagent: 改正unicast vrrp日志记录
2019-08-07 19:17:54 +08:00
yunion-ci-robot
eccd9744cc Merge pull request #2156 from ioito/automated-cherry-pick-of-#2123-upstream-release-2.10.0
Automated cherry pick of #2123: fix: get keypair info fail after rebuild-root
2019-08-07 18:03:43 +08:00
ioito
efd2bf4d63 fix: get keypair info fail after rebuild-root 2019-08-07 17:57:32 +08:00
yunion-ci-robot
ded1501a0f Merge pull request #2151 from ioito/automated-cherry-pick-of-#2149-upstream-release-2.10.0
Automated cherry pick of #2149: fix: not sync zstack deleted disk or instance & secgroup rule sync fix
2019-08-07 17:51:46 +08:00
yunion-ci-robot
25c50a1bc6 Merge pull request #2138 from wanyaoqi/automated-cherry-pick-of-#2136-upstream-release-2.10.0
Automated cherry pick of #2136: fix guest cannot delete
2019-08-07 17:22:38 +08:00
yunion-ci-robot
84b3778cea Merge pull request #2148 from ioito/automated-cherry-pick-of-#2135-upstream-release-2.10.0
Automated cherry pick of #2135: hotfix: essd PerformanceLevel sync
2019-08-07 17:21:38 +08:00
Yousong Zhou
471fd292be lbagent: 改正agent参数变更校验 2019-08-07 09:17:50 +00:00
Yousong Zhou
eb0a083811 lbagent: 改正unicast vrrp日志记录 2019-08-07 09:17:50 +00:00
rex zhasm
a3f5129af0 新增 climc notify-broadcast 接口,用于向所有在线用户发 websocket 通知 (#2132) 2019-08-07 16:43:05 +08:00
ioito
48d08302b4 fix: not sync zstack deleted disk or instance & secgroup rule sync fix 2019-08-07 16:21:05 +08:00
ioito
9104ce8006 hotfix: essd PerformanceLevel sync 2019-08-07 15:39:44 +08:00
yunion-ci-robot
59186f02d7 Merge pull request #2141 from swordqiu/automated-cherry-pick-of-#2140-upstream-release-2.10.0
Automated cherry pick of #2140: fix: auth through disconnected ldap IDP
2019-08-07 10:08:10 +08:00
Qiu Jian
96f40fae1a fix: auth through disconnected ldap IDP 2019-08-07 00:34:24 +08:00
yunion-ci-robot
e1c8d00f56 Merge pull request #2122 from ioito/hotfix/qx-sku-check
fix: 避免从高版本降级到2.10.0后因provider字段改变导致操作不兼容
2019-08-06 23:07:12 +08:00
yunion-ci-robot
285f692c0e Merge pull request #2126 from ioito/automated-cherry-pick-of-#2124-upstream-release-2.10.0
Automated cherry pick of #2124: hotfix: deprecated password auth
2019-08-06 23:06:09 +08:00
yunion-ci-robot
885cbe9ab0 Merge pull request #2119 from yousong/automated-cherry-pick-of-#2117-upstream-release-2.10.0
Automated cherry pick of #2117: lbclusters: 改正删除操作
2019-08-06 23:02:11 +08:00
wanyaoqi
403358a3cd fix guest cannot delete 2019-08-06 21:15:16 +08:00
yunion-ci-robot
3aad589253 Merge pull request #2121 from wanyaoqi/automated-cherry-pick-of-#2114-upstream-release-2.10.0
Automated cherry pick of #2114: misc bugfix
2019-08-06 20:26:09 +08:00
Yousong Zhou
141bf4b796 lbagents: 添加undeploy支持 2019-08-06 12:09:30 +00:00
Yousong Zhou
a2e689f93c lbclusters: 改正删除操作 2019-08-06 12:09:30 +00:00
Yousong Zhou
0cb083f16d climc: lb-create: 允许指定cluster 2019-08-06 12:09:30 +00:00
ioito
5823014d78 hotfix: deprecated password auth 2019-08-06 17:13:40 +08:00
yunion-ci-robot
78a013928a Merge pull request #2116 from tb365/bugfix/tb-bugfix-0807
huawei & aws & ucloud fix
2019-08-06 16:13:07 +08:00
ioito
c9d39dfa07 fix: 避免从高版本降级到2.10.0后因provider字段改变导致操作不兼容 2019-08-06 15:49:13 +08:00
wanyaoqi
bdd2142361 misc bugfix 2019-08-06 15:41:11 +08:00
yunion-ci-robot
6e65714bfc Merge pull request #2106 from swordqiu/automated-cherry-pick-of-#2105-upstream-release-2.10.0
Automated cherry pick of #2105: fix: adjust default policies for system resources
2019-08-06 15:30:09 +08:00
TangBin
d2442542c8 huawei & aws & ucloud fix 2019-08-06 15:21:57 +08:00
yunion-ci-robot
e96b3a9b7f Merge pull request #2111 from yousong/automated-cherry-pick-of-#2109-upstream-release-2.10.0
Automated cherry pick of #2109: lbclusters: 创建时仅允许指定OneCloud Zone
2019-08-06 15:07:09 +08:00
Yousong Zhou
5f574b3eb8 lbclusters: 创建时仅允许指定OneCloud Zone 2019-08-05 12:51:43 +00:00
yunion-ci-robot
7b6ed86554 Merge pull request #2099 from wanyaoqi/automated-cherry-pick-of-#2097-upstream-release-2.10.0
Automated cherry pick of #2097: secgroups get distinct tenant
2019-08-05 19:59:09 +08:00
yunion-ci-robot
4b6ed22608 Merge pull request #2096 from ioito/automated-cherry-pick-of-#2094-upstream-release-2.10.0
Automated cherry pick of #2094: hotfix: change order_by=guest -> order_by=guest_cnt
2019-08-05 19:51:08 +08:00
Qiu Jian
2214d29439 fix: adjust default policies for system resources 2019-08-05 18:58:39 +08:00
wanyaoqi
079144785a secgroups get distinct tenant 2019-08-05 12:03:46 +08:00
ioito
cf2a296d64 hotfix: change order_by=guest -> order_by=guest_cnt 2019-08-05 11:26:31 +08:00
yunion-ci-robot
a7684ca36f Merge pull request #2084 from ioito/automated-cherry-pick-of-#2082-upstream-release-2.10.0
Automated cherry pick of #2082: fix: get openstack all customize storage type
2019-08-02 20:16:05 +08:00
ioito
54ec7b453f fix: get openstack all customize storage type 2019-08-02 20:10:20 +08:00
yunion-ci-robot
956584b37c Merge pull request #2091 from yousong/automated-cherry-pick-of-#2089-upstream-release-2.10.0
Automated cherry pick of #2089: ansibleserver: 操作宿主机时默认使用用户root
2019-08-02 12:14:04 +08:00
yunion-ci-robot
515a371228 Merge pull request #2078 from wanyaoqi/automated-cherry-pick-of-#2060-upstream-release-2.10.0
Automated cherry pick of #2060: support get model distinct field
2019-08-02 12:13:04 +08:00
Yousong Zhou
6960fd1797 ansibleserver: 操作宿主机时默认使用用户root 2019-08-02 04:01:59 +00:00
yunion-ci-robot
bcf818f9d2 Merge pull request #2081 from ioito/automated-cherry-pick-of-#2079-upstream-release-2.10.0
Automated cherry pick of #2079: fix: cloudaccount and cloudprovider not in same domain
2019-08-01 22:23:04 +08:00
ioito
768cd4310f fix: cloudaccount and cloudprovider not in same domain 2019-08-01 21:58:56 +08:00
wanyaoqi
647dd4a6d4 support get model distinct field 2019-08-01 21:58:51 +08:00
yunion-ci-robot
dc53e5a113 Merge pull request #2069 from ioito/automated-cherry-pick-of-#2067-upstream-release-2.10.0
Automated cherry pick of #2067: fix: zstack create tcp udp secgroup rule error
2019-08-01 17:32:03 +08:00
yunion-ci-robot
750547fd00 Merge pull request #2066 from ioito/automated-cherry-pick-of-#2064-upstream-release-2.10.0
Automated cherry pick of #2064: hotfix: change params from order_by_cache=asc|desc to order_by=cache & order=asc|desc
2019-08-01 17:31:02 +08:00
yunion-ci-robot
2dd58236b2 Merge pull request #2050 from ioito/automated-cherry-pick-of-#2048-upstream-release-2.10.0
Automated cherry pick of #2048: fix: openstack glance image-list not list all images
2019-08-01 16:55:02 +08:00
yunion-ci-robot
bd02a4768d Merge pull request #2053 from swordqiu/automated-cherry-pick-of-#2051-upstream-release-2.10.0
Automated cherry pick of #2051: fix: 1. project quota-list not include domain quota 2. do not check conformance between project and domain quota
2019-08-01 16:47:02 +08:00
yunion-ci-robot
312b1e08a6 Merge pull request #2074 from wanyaoqi/automated-cherry-pick-of-#2072-upstream-release-2.10.0
Automated cherry pick of #2072: remove host rpm requre
2019-08-01 16:45:01 +08:00
wanyaoqi
cbdca56aff remove host rpm requre 2019-08-01 15:54:16 +08:00
yunion-ci-robot
24c6698e88 Merge pull request #2058 from swordqiu/automated-cherry-pick-of-#2057-upstream-release-2.10.0
Automated cherry pick of #2057: fix: server-list add is_prepaid_recycle field
2019-08-01 15:20:04 +08:00
ioito
b4ddd96a53 fix: zstack create tcp udp secgroup rule error 2019-07-31 22:05:16 +08:00
ioito
b8e00276e1 hotfix: change params from order_by_cache=asc|desc to order_by=cache & order=asc|desc 2019-07-31 21:46:16 +08:00
Qiu Jian
3fcee0953d fix: server-list add is_prepaid_recycle field 2019-07-31 18:32:53 +08:00
Qiu Jian
2f6573f6cd fix: 1. project quota-list not include domain quota 2. do not check conformance between project and domain quota 2019-07-31 17:52:55 +08:00
ioito
e8f9dcde2f fix: openstack glance image-list not list all images 2019-07-31 17:21:56 +08:00
yunion-ci-robot
d4a74e37e3 Merge pull request #2042 from wanyaoqi/automated-cherry-pick-of-#2040-upstream-release-2.10.0
Automated cherry pick of #2040: fix guest get host wire from network
2019-07-31 15:58:00 +08:00
yunion-ci-robot
8faf89aa3e Merge pull request #2028 from ioito/automated-cherry-pick-of-#2026-upstream-release-2.10.0
Automated cherry pick of #2026: fix: zstack system disk resize
2019-07-31 15:57:00 +08:00
yunion-ci-robot
e997f0b30f Merge pull request #2039 from yousong/automated-cherry-pick-of-#2037-upstream-release-2.10.0
Automated cherry pick of #2037: lbagents: 为influxdb_output_url设定默认值
2019-07-31 15:56:00 +08:00
yunion-ci-robot
cc09416c69 Merge pull request #2025 from ioito/automated-cherry-pick-of-#2001-upstream-release-2.10.0
Automated cherry pick of #2001: hotfix: validate resize disk when change config
2019-07-31 15:55:00 +08:00
yunion-ci-robot
4c3e3b82d0 Merge pull request #2021 from ioito/automated-cherry-pick-of-#1982-upstream-release-2.10.0
Automated cherry pick of #1982: fix: rbd image resize not found error
2019-07-31 15:53:59 +08:00
yunion-ci-robot
b5ecddb982 Merge pull request #2045 from wanyaoqi/automated-cherry-pick-of-#2043-upstream-release-2.10.0
Automated cherry pick of #2043: guest export keys add zone
2019-07-31 15:51:01 +08:00
wanyaoqi
ec1728362b guest export keys add zone 2019-07-31 15:44:15 +08:00
wanyaoqi
fdd0839eac fix guest get host wire from network 2019-07-31 14:33:39 +08:00
Yousong Zhou
0aca38fb48 lbagents: details=true时显示cluster的名称 2019-07-31 03:16:20 +00:00
Yousong Zhou
28934f0c20 lbagents: 为influxdb_output_url设定默认值 2019-07-31 03:16:20 +00:00
yunion-ci-robot
0c902764dc Merge pull request #2019 from wanyaoqi/automated-cherry-pick-of-#2017-upstream-release-2.10.0
Automated cherry pick of #2017: fix list order by
2019-07-31 02:23:57 +08:00
yunion-ci-robot
c8a0843fbc Merge pull request #2013 from Zexi/automated-cherry-pick-of-#2011-upstream-release-2.10.0
Automated cherry pick of #2011: region capability: fix regional public network not found
2019-07-31 02:21:58 +08:00
yunion-ci-robot
4a8477f86d Merge pull request #2036 from wanyaoqi/automated-cherry-pick-of-#2034-upstream-release-2.10.0
Automated cherry pick of #2034: remove telegraf config retention_policy
2019-07-30 22:05:59 +08:00
yunion-ci-robot
32c4051c02 Merge pull request #2033 from ioito/automated-cherry-pick-of-#2029-upstream-release-2.10.0
Automated cherry pick of #2029: fix: avoid region2 panic when update openstack storage
2019-07-30 22:00:58 +08:00
wanyaoqi
99f9b94bcd remove telegraf config retention_policy 2019-07-30 22:00:55 +08:00
ioito
f3aba2ef1c fix: avoid region2 panic when update openstack storage 2019-07-30 20:51:42 +08:00
ioito
62391c740c fix: zstack system disk resize 2019-07-30 19:30:45 +08:00
ioito
a20bdb1339 hotfix: validate resize disk when change config 2019-07-30 19:16:14 +08:00
ioito
62d7ffaac8 fix: rbd image resize not found error 2019-07-30 19:10:19 +08:00
wanyaoqi
68ba504ef7 fix list order by 2019-07-30 18:23:02 +08:00
yunion-ci-robot
9ffc238ac3 Merge pull request #2016 from Zexi/automated-cherry-pick-of-#2014-upstream-release-2.10.0
Automated cherry pick of #2014: region: fix server create input params not correct when detach sub resource
2019-07-30 18:14:34 +08:00
Zexi
4ebd7d7d03 region: fix server create input params not correct when detach sub resource 2019-07-30 18:09:00 +08:00
Zexi
5b1c852203 region capability: fix regional public network not found 2019-07-30 17:32:57 +08:00
yunion-ci-robot
5e6e00e6f7 Merge pull request #1987 from swordqiu/automated-cherry-pick-of-#1986-upstream-release-2.10.0
Automated cherry pick of #1986: fix: init sysadmin as system user
2019-07-30 16:50:32 +08:00
yunion-ci-robot
116a6bd9c4 Merge pull request #2003 from tb365/automated-cherry-pick-of-#2002-upstream-release-2.10.0
Automated cherry pick of #2002: copyright update climc fix
2019-07-30 13:59:32 +08:00
yunion-ci-robot
91024d62ce Merge pull request #1995 from tb365/automated-cherry-pick-of-#1994-upstream-release-2.10.0
Automated cherry pick of #1994: huawei rebuild root fix
2019-07-30 13:56:32 +08:00
yunion-ci-robot
6825457676 Merge pull request #2007 from ioito/automated-cherry-pick-of-#2005-upstream-release-2.10.0
Automated cherry pick of #2005: fix: add priority for openstack secgroup rule priority
2019-07-30 12:56:33 +08:00
yunion-ci-robot
5eec952d63 Merge pull request #1991 from ioito/automated-cherry-pick-of-#1989-upstream-release-2.10.0
Automated cherry pick of #1989: fix: qcloud reserved first, second and last ip for internal connection
2019-07-30 12:23:32 +08:00
yunion-ci-robot
fe086d41c2 Merge pull request #1999 from swordqiu/automated-cherry-pick-of-#1998-upstream-release-2.10.0
Automated cherry pick of #1998: fix: managed instance password not correct when deploy with keypair
2019-07-30 11:54:32 +08:00
ioito
46975fe5e0 fix: add priority for openstack secgroup rule priority 2019-07-30 11:50:34 +08:00
yunion-ci-robot
68a597cd96 Merge pull request #1985 from ioito/automated-cherry-pick-of-#1983-upstream-release-2.10.0
Automated cherry pick of #1983: fix: allow normal user create prepaid resource
2019-07-30 11:32:32 +08:00
TangBin
6ce2a174df copyright update climc fix 2019-07-30 11:14:28 +08:00
Qiu Jian
4a2ec7a7c1 fix: managed instance password not correct when deploy with keypair 2019-07-29 20:48:36 +08:00
TangBin
19873ff4c6 huawei rebuild root fix 2019-07-29 20:37:42 +08:00
ioito
3ae818d789 fix: qcloud reserved first, second and last ip for internal connection 2019-07-29 20:03:21 +08:00
Qiu Jian
9413360114 fix: init sysadmin as system user 2019-07-29 17:31:18 +08:00
ioito
e41b3ae2c4 fix: allow normal user create prepaid resource 2019-07-29 16:46:12 +08:00
yunion-ci-robot
18a73464f8 Merge pull request #1981 from wanyaoqi/automated-cherry-pick-of-#1979-upstream-release-2.10.0
Automated cherry pick of #1979: fix server purge
2019-07-29 15:19:31 +08:00
wanyaoqi
90d3e978ad fix server purge 2019-07-29 15:16:20 +08:00
yunion-ci-robot
a2eeaf7693 Merge pull request #1974 from swordqiu/hotfix/qj-turn-on-non-default-domain-projects-2.10
fix: turn on non-default-domain-projects by default at 2.10
2019-07-27 21:33:28 +08:00
Qiu Jian
7fc9447625 fix: turn on non-default-domain-projects by default at 2.10 2019-07-27 21:29:37 +08:00
yunion-ci-robot
8309dd0083 Merge pull request #1972 from swordqiu/automated-cherry-pick-of-#1969-upstream-release-2.10.0
Automated cherry pick of #1969: fix: server create eip quota check error
2019-07-27 21:28:29 +08:00
Qiu Jian
b632f26e39 fix: server create eip quota check error 2019-07-27 20:35:59 +08:00
yunion-ci-robot
ca14a256c7 Merge pull request #1968 from ioito/automated-cherry-pick-of-#1965-upstream-release-2.10.0
Automated cherry pick of #1965: 支持设置ceph精准超时时间
2019-07-27 18:58:29 +08:00
ioito
ae3ee5ae44 支持设置ceph精准超时时间 2019-07-27 18:49:41 +08:00
yunion-ci-robot
6f394545c2 Merge pull request #1964 from tb365/automated-cherry-pick-of-#1962-upstream-release-2.10.0
Automated cherry pick of #1962: add copyright api climc
2019-07-27 18:48:28 +08:00
TangBin
c77d7ead65 add copyright api climc 2019-07-27 16:52:58 +08:00
Qiu Jian
3971bf6a30 fix: allow turn off non-default domain projects 2019-07-27 15:52:11 +08:00
yunion-ci-robot
b775c58a2a Merge pull request #1956 from yousong/automated-cherry-pick-of-#1954-upstream-release-2.10.0
Automated cherry pick of #1954: ansibleplaybooks: 改正输出溢出时的记录
2019-07-27 09:59:07 +08:00
Yousong Zhou
87956baac9 ansibleplaybooks: 改正输出溢出时的记录 2019-07-27 01:14:07 +00:00
yunion-ci-robot
7af63125cb Merge pull request #1953 from yousong/automated-cherry-pick-of-#1951-upstream-release-2.10.0
Automated cherry pick of #1951: ansibleplaybooks: 改正启动失败问题
2019-07-27 00:36:06 +08:00
yunion-ci-robot
2f027684eb Merge pull request #1948 from wanyaoqi/automated-cherry-pick-of-#1946-upstream-release-2.10.0
Automated cherry pick of #1946: bugfix:
2019-07-27 00:33:07 +08:00
yunion-ci-robot
c0cd3245c8 Merge pull request #1944 from tb365/automated-cherry-pick-of-#1942-upstream-release-2.10.0
Automated cherry pick of #1942: 华为 & ucloud fix
2019-07-27 00:27:09 +08:00
Yousong Zhou
459915e4ce ansibleplaybooks: 增量式记录输出 2019-07-26 15:25:15 +00:00
Yousong Zhou
415584d63d pkg: ansible: 支持指定OutputWriter 2019-07-26 15:25:15 +00:00
Yousong Zhou
4669d91610 ansibleplaybooks: Output字段使用mediumtext 2019-07-26 15:25:15 +00:00
Yousong Zhou
95399ecc2c ansibleplaybooks: 改正启动失败问题 2019-07-26 15:25:15 +00:00
wanyaoqi
86b41420a8 bugfix:
- storage cache iso
- guest start on host
2019-07-26 19:47:42 +08:00
yunion-ci-robot
1b9faa7411 Merge pull request #1941 from yousong/automated-cherry-pick-of-#1939-upstream-release-2.10.0
Automated cherry pick of #1939: lbbackends: 若backend guest已删除getVpc返回空且不报错
2019-07-26 18:13:08 +08:00
TangBin
c0b4dc804c huawei rebuild root fix 2019-07-26 18:10:28 +08:00
TangBin
31494ccc22 华为 & ucloud fix 2019-07-26 18:10:28 +08:00
Yousong Zhou
6fe98f7d58 lbbackends: 若backend guest已删除getVpc返回空且不报错 2019-07-26 08:53:07 +00:00
yunion-ci-robot
167f180d2f Merge pull request #1912 from ioito/automated-cherry-pick-of-#1910-upstream-release-2.10.0
Automated cherry pick of #1910: fix: 避免镜像同步到私有云自定义镜像里面
2019-07-26 15:31:09 +08:00
yunion-ci-robot
484772b6c6 Merge pull request #1934 from yousong/automated-cherry-pick-of-#1932-upstream-release-2.10.0
Automated cherry pick of #1932: vendor: update yunion.io/x/pkg
2019-07-26 15:20:08 +08:00
yunion-ci-robot
e06b62e667 Merge pull request #1928 from swordqiu/automated-cherry-pick-of-#1927-upstream-release-2.10.0
Automated cherry pick of #1927: fix: not trauncating task errors
2019-07-26 13:32:10 +08:00
yunion-ci-robot
e35791c955 Merge pull request #1925 from swordqiu/automated-cherry-pick-of-#1924-upstream-release-2.10.0
Automated cherry pick of #1924: fix: server-create may timeout if external image used
2019-07-26 13:31:11 +08:00
yunion-ci-robot
e146e387c1 Merge pull request #1917 from Zexi/automated-cherry-pick-of-#1915-upstream-release-2.10.0
Automated cherry pick of #1915: baremetal: mkfs.ext4 add '-T largefile' option
2019-07-26 13:09:06 +08:00
yunion-ci-robot
dc1d9a6860 Merge pull request #1936 from Zexi/automated-cherry-pick-of-#1935-upstream-release-2.10.0
Automated cherry pick of #1935: region: fix server create params missing data
2019-07-26 12:54:09 +08:00
Zexi
4073d03390 region: fix server create params missing data 2019-07-26 12:51:40 +08:00
Yousong Zhou
1c08a0090a vendor: update yunion.io/x/pkg 2019-07-26 03:47:18 +00:00
yunion-ci-robot
8754468a8e Merge pull request #1920 from yousong/automated-cherry-pick-of-#1918-upstream-release-2.10.0
Automated cherry pick of #1918: lbagents: 加强vrrp校验
2019-07-25 22:39:05 +08:00
Qiu Jian
b0fe78e1aa fix: not trauncating task errors 2019-07-25 22:28:45 +08:00
Qiu Jian
c202412aa3 fix: server-create may timeout if external image used 2019-07-25 21:32:42 +08:00
Yousong Zhou
b2aec39331 lbagents: 加强vrrp校验
- 同cluster中的lbagent
   - vrrp virtual_router_id, preempt, pass必须相同
   - vrrp priority必须不同
 - 同zone不同cluster中的lbagent
   - vrrp virtual_router_id必须相同
 - 创建时若不满足以上条件,则创建失败
 - 更新参数时同时更新同cluster的peer lbagents
2019-07-25 10:53:59 +00:00
Zexi
2c09bf913f baremetal: mkfs.ext4 add '-T largefile' option 2019-07-25 17:12:27 +08:00
ioito
8bb9ebc581 fix: 避免镜像同步到私有云自定义镜像里面 2019-07-25 14:40:40 +08:00
yunion-ci-robot
be14fa6a2c Merge pull request #1907 from swordqiu/automated-cherry-pick-of-#1906-upstream-release-2.10.0
Automated cherry pick of #1906: fix: climc image-public parameter fix
2019-07-25 14:25:13 +08:00
yunion-ci-robot
dfa0afbb84 Merge pull request #1903 from swordqiu/automated-cherry-pick-of-#1902-upstream-release-2.10.0
Automated cherry pick of #1902: fix: role assignments list should include matched policies
2019-07-25 14:24:07 +08:00
yunion-ci-robot
610144a4af Merge pull request #1909 from ioito/automated-cherry-pick-of-#1467-upstream-release-2.10.0
Automated cherry pick of #1467: fix create disk scheduler failed
2019-07-25 11:05:05 +08:00
ioito
8257680548 fix create disk scheduler failed 2019-07-25 10:19:29 +08:00
Qiu Jian
9c0f446754 fix: climc image-public parameter fix 2019-07-25 10:16:31 +08:00
Qiu Jian
574df5a0a3 fix: role assignments list should include matched policies 2019-07-25 02:31:14 +08:00
yunion-ci-robot
faf68a098f Merge pull request #1887 from swordqiu/automated-cherry-pick-of-#1885-upstream-release-2.10.0
Automated cherry pick of #1885: fix: validate info when importing ldap user/group/domain
2019-07-24 16:06:06 +08:00
Qiu Jian
03a18fc797 fix: validate info when importing ldap user/group/domain 2019-07-24 16:02:02 +08:00
Jian Qiu
ff52ab86b1 fix: import errors (#1884) 2019-07-24 15:44:01 +08:00
yunion-ci-robot
e74644a62c Merge pull request #1881 from swordqiu/automated-cherry-pick-of-#1880-upstream-release-2.10.0
Automated cherry pick of #1880: fix: server-logininfo rpc include login_key
2019-07-24 13:26:09 +08:00
Qiu Jian
9412eb081b fix: server-logininfo rpc include login_key 2019-07-24 13:16:26 +08:00
yunion-ci-robot
3a69cf0bcf Merge pull request #1879 from wanyaoqi/automated-cherry-pick-of-#1877-upstream-release-2.10.0
Automated cherry pick of #1877: fix glance list share resource
2019-07-24 12:33:05 +08:00
wanyaoqi
04d825c291 fix glance list share resource 2019-07-24 11:56:54 +08:00
yunion-ci-robot
cd33bc8208 Merge pull request #1864 from ioito/automated-cherry-pick-of-#1860-upstream-release-2.10.0
Automated cherry pick of #1860: 添加同步安全组日志
2019-07-24 09:36:07 +08:00
yunion-ci-robot
06f225e183 Merge pull request #1868 from swordqiu/automated-cherry-pick-of-#1867-upstream-release-2.10.0
Automated cherry pick of #1867: fix: clear pending-delete when sched_fail
2019-07-24 09:34:07 +08:00
yunion-ci-robot
147a553383 Merge pull request #1873 from swordqiu/automated-cherry-pick-of-#1872-upstream-release-2.10.0
Automated cherry pick of #1872: fix: keystone user initialization hit empty extra
2019-07-24 09:25:05 +08:00
Qiu Jian
2bd905f92e fix: keystone user initialization hit empty extra 2019-07-24 09:15:33 +08:00
Qiu Jian
acd530708c fix: clear pending-delete when sched_fail 2019-07-23 23:47:58 +08:00
yunion-ci-robot
9fb63372e2 Merge pull request #1858 from swordqiu/automated-cherry-pick-of-#1857-upstream-release-2.10.0
Automated cherry pick of #1857: fix: esxi change instanceType failed as ChangeConfig2 not implemented
2019-07-23 22:13:07 +08:00
ioito
1bf7152cda 避免重复设置同一vpc底下不同安全组externalId 2019-07-23 21:54:43 +08:00
ioito
6c2a89c277 添加同步安全组日志 2019-07-23 21:54:43 +08:00
Qiu Jian
8f30927648 fix: esxi change instanceType failed as ChangeConfig2 not implemented 2019-07-23 21:15:52 +08:00
yunion-ci-robot
c4f6f51fe4 Merge pull request #1854 from wanyaoqi/automated-cherry-pick-of-#1852-upstream-release-2.10.0
Automated cherry pick of #1852: fix baremetal attach network
2019-07-23 21:06:05 +08:00
yunion-ci-robot
02b08ec8d1 Merge pull request #1856 from ioito/automated-cherry-pick-of-#1840-upstream-release-2.10.0
Automated cherry pick of #1840: 卸载磁盘时忽略云上磁盘已经被删除的错误
2019-07-23 20:17:05 +08:00
yunion-ci-robot
454e53a4f6 Merge pull request #1847 from ioito/automated-cherry-pick-of-#1829-upstream-release-2.10.0
Automated cherry pick of #1829: 避免cacheimage refresh时同步azure镜像信息异常
2019-07-23 18:43:05 +08:00
ioito
cbffbd942a 卸载磁盘时忽略云上磁盘已经被删除的错误 2019-07-23 18:35:33 +08:00
wanyaoqi
e3ec65ad32 fix baremetal attach network 2019-07-23 18:18:54 +08:00
yunion-ci-robot
15a429f6fe Merge pull request #1851 from wanyaoqi/automated-cherry-pick-of-#1843-upstream-release-2.10.0
Automated cherry pick of #1843: bugfix: baremetal import , guest panic notify
2019-07-23 18:18:05 +08:00
wanyaoqi
c065876fe0 bugfix: baremetal import , guest panic notify
- reset baremetal access ip on baremetal rebuild
- add guest panic notify template
2019-07-23 16:15:50 +08:00
ioito
238ea67443 避免cacheimage refresh时同步azure镜像信息异常 2019-07-23 15:05:59 +08:00
yunion-ci-robot
90b08721fc Merge pull request #1838 from wanyaoqi/automated-cherry-pick-of-#1837-upstream-release-2.10.0
Automated cherry pick of #1837: fix guest check quota on change config
2019-07-23 12:06:08 +08:00
yunion-ci-robot
567a32ab27 Merge pull request #1834 from ioito/automated-cherry-pick-of-#1832-upstream-release-2.10.0
Automated cherry pick of #1832: 避免因cloudprovider disable导致账号同步失效
2019-07-23 12:03:06 +08:00
yunion-ci-robot
1d8b232439 Merge pull request #1826 from ioito/automated-cherry-pick-of-#1820-upstream-release-2.10.0
Automated cherry pick of #1820: 仅忽略 no such service错误,否则以最新api结果为准
2019-07-23 11:59:05 +08:00
wanyaoqi
9e2ad488e6 fix guest check quota on change config 2019-07-22 21:18:13 +08:00
ioito
a469547219 避免因cloudprovider disable导致账号同步失效 2019-07-22 20:04:48 +08:00
Zexi Li
88eff95c97 Merge pull request #1830 from Zexi/automated-cherry-pick-of-#1823-upstream-release-2.10.0
Automated cherry pick of #1823: fix: node count for a virtualized host is always 1
2019-07-22 19:16:07 +08:00
Qiu Jian
2c0bbb8e86 fix: node count for a virtualized host is always 1 2019-07-22 19:15:10 +08:00
ioito
4f8b2b3d68 仅忽略 no such service错误,否则以最新api结果为准 2019-07-22 10:11:32 +08:00
yunion-ci-robot
1cb396f94c Merge pull request #1816 from swordqiu/automated-cherry-pick-of-#1815-upstream-release-2.10.0
Automated cherry pick of #1815: fix: image add is_standard field, filter by is_standard=false|true
2019-07-22 10:04:05 +08:00
yunion-ci-robot
74ff996a65 Merge pull request #1705 from wanyaoqi/automated-cherry-pick-of-#1689-upstream-release-2.10.0
Automated cherry pick of #1689: auto create subnet on host register
2019-07-20 13:32:04 +08:00
yunion-ci-robot
7f4ee2091b Merge pull request #1802 from tb365/automated-cherry-pick-of-#1801-upstream-release-2.10.0
Automated cherry pick of #1801: ucloud bugfix
2019-07-19 15:40:05 +08:00
TangBin
b13b8629a6 ucloud bugfix 2019-07-19 15:34:06 +08:00
wanyaoqi
85fa9ac2bd auto create subnet on host register 2019-07-19 15:30:56 +08:00
Qiu Jian
b221a5c300 fix: image add is_standard field, filter by is_standard=false|true 2019-07-19 15:13:21 +08:00
yunion-ci-robot
69fa66af2a Merge pull request #1814 from wanyaoqi/automated-cherry-pick-of-#1812-upstream-release-2.10.0
Automated cherry pick of #1812: host reload telegraf
2019-07-19 11:40:03 +08:00
wanyaoqi
e253031949 host reload telegraf 2019-07-19 11:37:25 +08:00
yunion-ci-robot
ab762eaece Merge pull request #1810 from Zexi/automated-cherry-pick-of-#1808-upstream-release-2.10.0
Automated cherry pick of #1808: scheduler: esxi and zstack hypervisor do cpu and memory filter
2019-07-19 00:50:04 +08:00
yunion-ci-robot
94f27f7937 Merge pull request #1807 from ioito/automated-cherry-pick-of-#1805-upstream-release-2.10.0
Automated cherry pick of #1805: 允许更改openstack存储容量
2019-07-19 00:46:02 +08:00
Zexi
34c267bc22 scheduler: esxi and zstack hypervisor do cpu and memory filter 2019-07-18 20:26:56 +08:00
ioito
5db7002fcc 允许更改openstack存储容量 2019-07-18 19:44:41 +08:00
yunion-ci-robot
64b5c9c229 Merge pull request #1795 from ioito/automated-cherry-pick-of-#1761-upstream-release-2.10.0
Automated cherry pick of #1761: 添加lb eip同步
2019-07-18 15:43:58 +08:00
yunion-ci-robot
fd9570c7b9 Merge pull request #1798 from ioito/automated-cherry-pick-of-#1796-upstream-release-2.10.0
Automated cherry pick of #1796: 提高openstack创建windows机器成功率
2019-07-18 15:39:00 +08:00
ioito
931192cef3 提高openstack创建windows机器成功率 2019-07-18 15:05:57 +08:00
ioito
1e27e5486a 添加lb eip同步 2019-07-18 14:56:32 +08:00
yunion-ci-robot
1582760284 Merge pull request #1790 from swordqiu/automated-cherry-pick-of-#1789-upstream-release-2.10.0
Automated cherry pick of #1789: fix: server change owner did not change disk's owner
2019-07-18 14:18:01 +08:00
yunion-ci-robot
4579b98c8d Merge pull request #1788 from wanyaoqi/automated-cherry-pick-of-#1786-upstream-release-2.10.0
Automated cherry pick of #1786: disk reset set server status
2019-07-18 14:10:59 +08:00
Qiu Jian
e7336217bc fix: server change owner did not change disk's owner 2019-07-18 14:05:21 +08:00
wanyaoqi
04be9cf8d6 disk reset set server status 2019-07-18 11:38:16 +08:00
Zexi Li
f4c655125b Merge pull request #1784 from Zexi/automated-cherry-pick-of-#1783-upstream-release-2.10.0
Automated cherry pick of #1783: glance: fix duplicate data for node db_stats
2019-07-18 10:47:42 +08:00
Zexi
7307d0d5d0 glance: fix duplicate data for node db_stats 2019-07-18 10:46:55 +08:00
yunion-ci-robot
e1c20e6e8e Merge pull request #1781 from Zexi/automated-cherry-pick-of-#1779-upstream-release-2.10.0
Automated cherry pick of #1779: baremetal: fix msdos last primary partition not resized
2019-07-17 22:16:58 +08:00
Zexi
def2f6be96 baremetal: fix msdos last primary partition not resized 2019-07-17 22:09:15 +08:00
yunion-ci-robot
4833fbdea8 Merge pull request #1777 from swordqiu/automated-cherry-pick-of-#1776-upstream-release-2.10.0
Automated cherry pick of #1776: fix: allow access mcclient serviceCatalog
2019-07-17 21:30:59 +08:00
yunion-ci-robot
c8d8ad6c5d Merge pull request #1767 from swordqiu/automated-cherry-pick-of-#1766-upstream-release-2.10.0
Automated cherry pick of #1766: fix: allow project creating prepaid servers
2019-07-17 21:29:01 +08:00
Qiu Jian
7ee238bd11 fix: allow access mcclient serviceCatalog 2019-07-17 21:14:41 +08:00
yunion-ci-robot
11a8b36b83 Merge pull request #1757 from Zexi/automated-cherry-pick-of-#1756-upstream-release-2.10.0
Automated cherry pick of #1756: region: server order by account and remove models stale comments
2019-07-17 21:11:57 +08:00
yunion-ci-robot
dee229479d Merge pull request #1747 from wanyaoqi/automated-cherry-pick-of-#1745-upstream-release-2.10.0
Automated cherry pick of #1745: fix deploy network with routes
2019-07-17 21:03:57 +08:00
yunion-ci-robot
8f94a94bfb Merge pull request #1771 from Zexi/automated-cherry-pick-of-#1770-upstream-release-2.10.0
Automated cherry pick of #1770: scheduler: schedtag predicate match resources then do filter
2019-07-17 13:48:58 +08:00
yunion-ci-robot
d7bff5c755 Merge pull request #1765 from Zexi/automated-cherry-pick-of-#1763-upstream-release-2.10.0
Automated cherry pick of #1763: service db init sync exit
2019-07-17 13:45:59 +08:00
Zexi
4915e8deb8 scheduler: schedtag predicate match resources then do filter 2019-07-17 13:21:47 +08:00
Qiu Jian
fa702f4745 fix: allow project creating prepaid servers 2019-07-16 19:43:26 +08:00
Zexi
9d9c217ffd db: app service support --exit-after-db-init 2019-07-16 19:16:36 +08:00
Zexi
efe9ee5c5c service db init sync exit 2019-07-16 19:16:36 +08:00
yunion-ci-robot
d1bb9231f2 Merge pull request #1755 from Zexi/automated-cherry-pick-of-#1753-upstream-release-2.10.0
Automated cherry pick of #1753: region: fix baremetal specs not found when domain_id specify
2019-07-16 16:59:59 +08:00
Zexi
9e019aa55c region: server order by account and remove models stale comments 2019-07-16 16:10:47 +08:00
yunion-ci-robot
927574fac1 Merge pull request #1737 from wanyaoqi/automated-cherry-pick-of-#1735-upstream-release-2.10.0
Automated cherry pick of #1735: add verify storage mount point
2019-07-16 12:52:58 +08:00
wanyaoqi
05b9cdcbad add verify storage mount point 2019-07-16 11:35:14 +08:00
wanyaoqi
5d6a725d6c fix deploy network with routes 2019-07-16 11:14:43 +08:00
Zexi
eaacbe40ea region: fix baremetal specs not found when domain_id specify 2019-07-16 11:14:10 +08:00
yunion-ci-robot
eb730e3981 Merge pull request #1751 from Zexi/automated-cherry-pick-of-#1717-upstream-release-2.10.0
Automated cherry pick of #1717: host 相关的 rpm 包自动添加 systemd unit service 文件
2019-07-16 11:07:58 +08:00
Zexi
e2c886ba4d host 相关的 rpm 包自动添加 systemd unit service 文件 2019-07-16 10:26:14 +08:00
yunion-ci-robot
e1623368be Merge pull request #1740 from wanyaoqi/automated-cherry-pick-of-#1738-upstream-release-2.10.0
Automated cherry pick of #1738: host listen before register
2019-07-15 23:48:00 +08:00
yunion-ci-robot
79ef325360 Merge pull request #1749 from swordqiu/automated-cherry-pick-of-#1748-upstream-release-2.10.0
Automated cherry pick of #1748: fix: server-change-ipaddr may ignore errors when changing ipaddr
2019-07-15 23:37:01 +08:00
Qiu Jian
652cc46123 fix: server-change-ipaddr may ignore errors when changing ipaddr 2019-07-15 23:00:09 +08:00
yunion-ci-robot
daf7892a27 Merge pull request #1734 from yousong/automated-cherry-pick-of-#1732-upstream-release-2.10.0
Automated cherry pick of #1732: lb: 将lb.backendgroup视为弱引用
2019-07-15 22:17:58 +08:00
yunion-ci-robot
f2d7181386 Merge pull request #1743 from ioito/automated-cherry-pick-of-#1741-upstream-release-2.10.0
Automated cherry pick of #1741: 避免设置disable的cloudproviderregion状态
2019-07-15 21:36:59 +08:00
ioito
8a743b20fa 避免设置disable的cloudproviderregion状态 2019-07-15 16:42:20 +08:00
wanyaoqi
be166937b2 host listen before register 2019-07-15 16:05:10 +08:00
Yousong Zhou
5de506effc lb: 将lb.backendgroup视为弱引用 2019-07-15 05:01:09 +00:00
yunion-ci-robot
3b56ca9dc1 Merge pull request #1730 from yousong/automated-cherry-pick-of-#1729-release-2.10.0
Automated cherry pick of #1729: .circleci: 改进test执行
2019-07-15 12:40:59 +08:00
Yousong Zhou
7b1190735f .circleci: 改进test执行
避免go test执行两次

避免因push到codecov失败造成测试失败

  1457 @@ -10576,5 +10576,33 @@ yunion.io/x/onecloud/pkg/webconsole/comm
  1458  yunion.io/x/onecloud/pkg/webconsole/command/ssh_command.go:147:                        GetData
  1459  yunion.io/x/onecloud/pkg/webconsole/command/ssh_command.go:164:                        ShowInf
  1460  total:                                                                         (statements)
  1461 -Push /tmp/coverage.8mKa1lRFeG/profile.out to codecov.io^M
  1462 -Exited with code 7
  1463 \ No newline at end of file
  1464 +Push /tmp/coverage.GrWO8OlTrX/profile.out to codecov.io^M
  1465 +^M
  1466 +  _____          _^M
  1467 + / ____|        | |^M
  1468 +| |     ___   __| | ___  ___ _____   __^M
  1469 +| |    / _ \ / _` |/ _ \/ __/ _ \ \ / /^M
  1470 +| |___| (_) | (_| |  __/ (_| (_) \ V /^M
  1471 + \_____\___/ \__,_|\___|\___\___/ \_/^M
  1472 +                              Bash-8a28df4^M
  1473 +^M
  1474 +^M
  1475 +==> Circle CI detected.^M
  1476 +    project root: .^M
  1477 +--> token set from env^M
  1478 +    Yaml found at: vendor/github.com/gin-gonic/gin/codecov.yml^M
  1479 +    -> Found 1 reports^M
  1480 +==> Detecting git/mercurial file structure^M
  1481 +==> Reading reports^M
  1482 +    + /tmp/coverage.GrWO8OlTrX/profile.out bytes=2221509^M
2019-07-15 03:50:24 +00:00
yunion-ci-robot
10540d33b2 Merge pull request #1722 from swordqiu/automated-cherry-pick-of-#1721-upstream-release-2.10.0
Automated cherry pick of #1721: fix: ldap sync domain may remove local usrs
2019-07-15 11:16:57 +08:00
yunion-ci-robot
cdc9b6b538 Merge pull request #1726 from ioito/automated-cherry-pick-of-#1724-upstream-release-2.10.0
Automated cherry pick of #1724: 修复purge backend野指针引用问题
2019-07-15 10:36:57 +08:00
ioito
cdf9ed1d12 修复purge backend野指针引用问题 2019-07-15 10:23:34 +08:00
yunion-ci-robot
a8715aca65 Merge pull request #1719 from Zexi/automated-cherry-pick-of-#1718-upstream-release-2.10.0
Automated cherry pick of #1718: scheduler: optimize forecast filter info
2019-07-15 09:23:58 +08:00
Zexi
cc61846359 scheduler: optimize forecast filter info 2019-07-15 09:18:18 +08:00
Qiu Jian
f5cdb2b6cc fix: ldap sync domain may remove local usrs 2019-07-15 08:44:37 +08:00
yunion-ci-robot
47b71cea35 Merge pull request #1708 from yousong/automated-cherry-pick-of-#1706-release-2.10.0
Automated cherry pick of #1706: lbagent: deploy: 仓库配置文件默认sslverify=0
2019-07-13 20:28:57 +08:00
yunion-ci-robot
797bfc009e Merge pull request #1716 from wanyaoqi/automated-cherry-pick-of-#1714-upstream-release-2.10.0
Automated cherry pick of #1714: fix  disk create from snapshot
2019-07-13 19:23:58 +08:00
wanyaoqi
a9fc3adcb8 fix disk create from snapshot 2019-07-13 19:22:37 +08:00
yunion-ci-robot
766076aa1c Merge pull request #1711 from ioito/automated-cherry-pick-of-#1709-upstream-release-2.10.0
Automated cherry pick of #1709: fix console log
2019-07-13 17:39:00 +08:00
ioito
117cbc428a fix console log 2019-07-13 14:47:01 +08:00
Yousong Zhou
cbc3a3b921 lbagent: deploy: 部署结束重启服务 2019-07-13 05:21:09 +00:00
Yousong Zhou
84a478ffad lbagent: deploy: 仓库配置文件默认sslverify=0 2019-07-13 05:21:09 +00:00
yunion-ci-robot
7d0dab5ae4 Merge pull request #1698 from ioito/automated-cherry-pick-of-#1696-upstream-release-2.10.0
Automated cherry pick of #1696: 补充zstack宿主机本地存储
2019-07-12 14:44:56 +08:00
yunion-ci-robot
2b2b48ae09 Merge pull request #1691 from swordqiu/automated-cherry-pick-of-#1690-upstream-release-2.10.0
Automated cherry pick of #1690: fix: invalid old password
2019-07-12 14:43:00 +08:00
yunion-ci-robot
1742963639 Merge pull request #1701 from ioito/automated-cherry-pick-of-#1699-upstream-release-2.10.0
Automated cherry pick of #1699: 同优先级规则deny优先于allow规则生效
2019-07-12 12:01:56 +08:00
ioito
a8d6afe3f9 同优先级规则deny优先于allow规则生效 2019-07-12 11:54:23 +08:00
ioito
d3f43b3e76 补充zstack宿主机本地存储 2019-07-12 10:40:25 +08:00
yunion-ci-robot
f4682443c6 Merge pull request #1695 from wanyaoqi/automated-cherry-pick-of-#1693-upstream-release-2.10.0
Automated cherry pick of #1693: fix host register:
2019-07-12 10:32:56 +08:00
wanyaoqi
641055de71 fix host register: 2019-07-12 10:30:19 +08:00
yunion-ci-robot
7a30fc0c67 Merge pull request #1683 from ioito/automated-cherry-pick-of-#1681-upstream-release-2.10.0
Automated cherry pick of #1681: 宿主机存储利用率仅计算本地存储
2019-07-12 09:07:57 +08:00
Qiu Jian
b5b214cab6 fix: invalid old password 2019-07-11 23:59:24 +08:00
yunion-ci-robot
459aa22987 Merge pull request #1687 from swordqiu/automated-cherry-pick-of-#1686-upstream-release-2.10.0
Automated cherry pick of #1686: fix: notify message use brand insteand of hypervisor
2019-07-11 19:57:57 +08:00
Qiu Jian
ea09d533d1 fix: notify message use brand insteand of hypervisor 2019-07-11 18:35:30 +08:00
yunion-ci-robot
8aee738a7c Merge pull request #1678 from ioito/automated-cherry-pick-of-#1676-upstream-release-2.10.0
Automated cherry pick of #1676: 避免重装系统时绑定秘钥后没有account信息
2019-07-11 18:30:58 +08:00
ioito
fa469a77cf 宿主机存储利用率仅计算本地存储 2019-07-11 17:29:11 +08:00
ioito
b5af099bb8 避免重装系统时绑定秘钥后没有account信息 2019-07-11 16:59:49 +08:00
yunion-ci-robot
871c6e9d99 Merge pull request #1675 from tb365/automated-cherry-pick-of-#1649-upstream-release-2.10.0
Automated cherry pick of #1649: add rpc-global-settings-dictionary
2019-07-11 16:54:57 +08:00
TangBin
5bd2a03bb7 make fmt 2019-07-11 16:52:12 +08:00
yunion-ci-robot
fe506db0fb Merge pull request #1674 from ioito/automated-cherry-pick-of-#1672-upstream-release-2.10.0
Automated cherry pick of #1672: fix grpc client timeout
2019-07-11 13:47:58 +08:00
ioito
4e24dbcc09 fix grpc client timeout 2019-07-11 13:43:33 +08:00
yunion-ci-robot
b7a55a7ccd Merge pull request #1670 from swordqiu/automated-cherry-pick-of-#1667-upstream-release-2.10.0
Automated cherry pick of #1667: fix: task usercred should be utf8 charset
2019-07-11 12:18:56 +08:00
Qiu Jian
4dab0e1846 fix: task usercred should be utf8 charset 2019-07-11 12:12:45 +08:00
yunion-ci-robot
97acf23a77 Merge pull request #1666 from wanyaoqi/automated-cherry-pick-of-#1662-upstream-release-2.10.0
Automated cherry pick of #1662: baremetal init fsdriver
2019-07-11 12:01:56 +08:00
wanyaoqi
83debc7403 baremetal init fsdriver 2019-07-11 11:42:00 +08:00
Jian Qiu
379b99efca Automated cherry pick of #1659: fix: add all ports usage (#1660)
* fix: add all ports usage

* fix: action log project-domain charset is not utf8
2019-07-11 08:57:48 +08:00
yunion-ci-robot
dbd9dbc5f9 Merge pull request #1656 from ioito/automated-cherry-pick-of-#1654-upstream-release-2.10.0
Automated cherry pick of #1654: fix qcloud associate eip timeout after bind
2019-07-11 08:45:56 +08:00
ioito
930f4f34c5 fix qcloud associate eip timeout after bind 2019-07-10 21:14:05 +08:00
yunion-ci-robot
6826331114 Merge pull request #1651 from wanyaoqi/automated-cherry-pick-of-#1603-upstream-release-2.10.0
Automated cherry pick of #1603: - set mirror status on switch
2019-07-10 21:01:56 +08:00
yunion-ci-robot
f5ee0a5805 Merge pull request #1652 from tb365/automated-cherry-pick-of-#1649-upstream-release-2.10.0
Automated cherry pick of #1649: add rpc-global-settings-dictionary
2019-07-10 20:58:57 +08:00
wanyaoqi
85e49b8520 add build file 2019-07-10 20:45:11 +08:00
wanyaoqi
c9aa62f6d7 - set mirror status on switch
- deploy agent

- gpfs snapshot

- code fixs
2019-07-10 20:45:10 +08:00
yunion-ci-robot
042f983815 Merge pull request #1643 from ioito/automated-cherry-pick-of-#1641-upstream-release-2.10.0
Automated cherry pick of #1641: 统一处理ResourceNotFound返回id not find
2019-07-10 20:44:57 +08:00
yunion-ci-robot
5501c1c0eb Merge pull request #1640 from ioito/automated-cherry-pick-of-#1638-upstream-release-2.10.0
Automated cherry pick of #1638: 避免无限删除guest失败
2019-07-10 20:42:57 +08:00
TangBin
2682d903f8 add rpc-global-settings-dictionary 2019-07-10 20:28:41 +08:00
ioito
dcbb0677f8 统一处理ResourceNotFound返回id not find 2019-07-10 16:11:50 +08:00
ioito
adc05c6caa 避免无限删除guest失败 2019-07-10 15:27:05 +08:00
yunion-ci-robot
a37759d756 Merge pull request #1636 from swordqiu/automated-cherry-pick-of-#1635-upstream-release-2.10.0
Automated cherry pick of #1635: fix: possible reduce timeout for quota list
2019-07-10 11:55:56 +08:00
Qiu Jian
70f8fefe10 fix: disk quota usage should exclude pending_deleted disks 2019-07-10 00:11:01 +08:00
Qiu Jian
2bba1ab7f3 fix: possible reduce timeout for quota list 2019-07-10 00:11:01 +08:00
yunion-ci-robot
71d58f8b6d Merge pull request #1628 from ioito/automated-cherry-pick-of-#1626-upstream-release-2.10.0
Automated cherry pick of #1626: metadata permission
2019-07-09 23:23:57 +08:00
Jian Qiu
24406afe2d fix: domain usage is overriden by project usage (#1623) 2019-07-09 23:23:34 +08:00
yunion-ci-robot
851f15226f Merge pull request #1632 from ioito/automated-cherry-pick-of-#1622-upstream-release-2.10.0
Automated cherry pick of #1622: 兼容zone及usable参数
2019-07-09 23:01:55 +08:00
ioito
8f28c80dd9 兼容zone及usable参数 2019-07-09 22:45:42 +08:00
ioito
4184238f0e metadata permission 2019-07-09 22:42:36 +08:00
yunion-ci-robot
484a94b59a Merge pull request #1615 from ioito/automated-cherry-pick-of-#1604-upstream-release-2.10.0
Automated cherry pick of #1604: register sched-start-guest task
2019-07-09 17:30:56 +08:00
yunion-ci-robot
de528bd85e Merge pull request #1607 from ioito/automated-cherry-pick-of-#1602-upstream-release-2.10.0
Automated cherry pick of #1602: add task failed code
2019-07-09 17:28:58 +08:00
yunion-ci-robot
a953ccba17 Merge pull request #1611 from ioito/automated-cherry-pick-of-#1605-upstream-release-2.10.0
Automated cherry pick of #1605: fix clone rbd image error
2019-07-09 17:22:58 +08:00
yunion-ci-robot
bb30d17965 Merge pull request #1620 from swordqiu/automated-cherry-pick-of-#1619-upstream-release-2.10.0
Automated cherry pick of #1619: fix: add default network project privileges
2019-07-09 17:18:56 +08:00
yunion-ci-robot
b497c1e03f Merge pull request #1617 from zhasm/automated-cherry-pick-of-#1616-upstream-release-2.10.0
Automated cherry pick of #1616: + zstack build desc file
2019-07-09 17:17:58 +08:00
Qiu Jian
e4dae64d4d add usage debug 2019-07-09 17:13:26 +08:00
Qiu Jian
325361504c fix: add default network project privileges 2019-07-09 17:13:26 +08:00
Zhang Dongliang
19dad62b37 + zstack build desc file 2019-07-09 16:54:05 +08:00
ioito
c978c63215 register sched-start-guest task 2019-07-09 15:53:41 +08:00
ioito
a515278fee fix clone rbd image error 2019-07-09 15:49:27 +08:00
ioito
9c8ed72488 add task failed code 2019-07-09 15:45:35 +08:00
yunion-ci-robot
5c8f4b19a3 Merge pull request #1601 from ioito/automated-cherry-pick-of-#1599-upstream-release-2.10.0
Automated cherry pick of #1599: fix max session login issue
2019-07-08 21:48:56 +08:00
ioito
e209532a1c fix max session login issue 2019-07-08 16:45:58 +08:00
yunion-ci-robot
51e4dbbe41 Merge pull request #1598 from ioito/automated-cherry-pick-of-#1596-upstream-release-2.10.0
Automated cherry pick of #1596: 私有云或公有云镜像windows默认用户名都是Administrator
2019-07-07 19:08:58 +08:00
ioito
2cac70071d 私有云或公有云镜像windows默认用户名都是Administrator 2019-07-07 18:46:31 +08:00
Jian Qiu
f3e6aca6de fix: image quota rpc support action and cascade params (#1594) 2019-07-06 23:55:18 +08:00
yunion-ci-robot
b562e99a6e Merge pull request #1592 from ioito/automated-cherry-pick-of-#1568-upstream-release-2.10.0
Automated cherry pick of #1568: fix cache domain tenants
2019-07-06 17:19:54 +08:00
yunion-ci-robot
9833f02016 Merge pull request #1590 from ioito/automated-cherry-pick-of-#1584-upstream-release-2.10.0
Automated cherry pick of #1584: fix create server sku not found error
2019-07-06 17:16:54 +08:00
ioito
7d8a5e1d56 fix cache domain tenants 2019-07-06 16:59:02 +08:00
ioito
48c8c74b9d fix create server sku not found error 2019-07-06 16:57:05 +08:00
yunion-ci-robot
a0e199dc3a Merge pull request #1575 from ioito/automated-cherry-pick-of-#1573-upstream-release-2.10.0
Automated cherry pick of #1573: add usable filter for network
2019-07-05 23:03:57 +08:00
Jian Qiu
5ff60bc6d7 fix: quota encode json allowing zero value (#1571) 2019-07-05 23:03:44 +08:00
yunion-ci-robot
46395e3ec6 Merge pull request #1560 from ioito/automated-cherry-pick-of-#1551-upstream-release-2.10.0
Automated cherry pick of #1551: add without_user_meta filter
2019-07-05 22:45:56 +08:00
yunion-ci-robot
09ba6283d6 Merge pull request #1565 from ioito/automated-cherry-pick-of-#1563-upstream-release-2.10.0
Automated cherry pick of #1563: add deploy failed action log
2019-07-05 22:30:00 +08:00
yunion-ci-robot
ed0094fc2e Merge pull request #1562 from ioito/automated-cherry-pick-of-#1543-upstream-release-2.10.0
Automated cherry pick of #1543: fix not set guest status after attach or detach disk
2019-07-05 22:26:54 +08:00
yunion-ci-robot
68ae6a0648 Merge pull request #1556 from ioito/automated-cherry-pick-of-#1550-upstream-release-2.10.0
Automated cherry pick of #1550: fix purge aliyun account error by lbbg
2019-07-05 22:22:01 +08:00
ioito
ca23a5906e add usable filter for network 2019-07-05 18:50:03 +08:00
ioito
a535a019f5 add deploy failed action log 2019-07-05 14:19:11 +08:00
ioito
50ba8365d0 optimized tag filter 2019-07-05 10:24:51 +08:00
ioito
8a1471860e fix not set guest status after attach or detach disk 2019-07-05 10:18:17 +08:00
yunion-ci-robot
631ea3312b Merge pull request #1545 from swordqiu/automated-cherry-pick-of-#1544-upstream-release-2.10.0
Automated cherry pick of #1544: fix: add disk usage for domain and project
2019-07-05 10:16:54 +08:00
ioito
d240f747bb add without_user_meta filter 2019-07-05 10:16:00 +08:00
yunion-ci-robot
b5a547a1c1 Merge pull request #1553 from swordqiu/automated-cherry-pick-of-#1552-upstream-release-2.10.0
Automated cherry pick of #1552: 1. allow replace set quota when action=replace 2. show when the project external resource was fetched
2019-07-05 10:14:56 +08:00
yunion-ci-robot
0e50f2d8da Merge pull request #1541 from swordqiu/automated-cherry-pick-of-#1540-upstream-release-2.10.0
Automated cherry pick of #1540: fix: user filter by role
2019-07-05 10:13:54 +08:00
ioito
10040b96f5 fix purge aliyun account error by lbbg 2019-07-05 10:10:28 +08:00
yunion-ci-robot
53e6039093 Merge pull request #1549 from ioito/automated-cherry-pick-of-#1547-upstream-release-2.10.0
Automated cherry pick of #1547: add azure disk reset func
2019-07-04 23:55:57 +08:00
Qiu Jian
ac8f5655aa 1. allow replace set quota when action=replace 2. show when the project external resource was fetched 2019-07-04 23:37:39 +08:00
Qiu Jian
ee83b3b7da add nics usage 2019-07-04 21:34:08 +08:00
Qiu Jian
047072e0c9 fix: add disk usage for domain and project 2019-07-04 21:33:53 +08:00
ioito
33158aa7c0 add azure disk reset func 2019-07-04 20:04:43 +08:00
yunion-ci-robot
633bed6ab6 Merge pull request #1506 from ioito/hotfix/qx-sku-filter
fix idc sku filter at 2.10.0
2019-07-04 15:35:54 +08:00
yunion-ci-robot
a3d2c3c102 Merge pull request #1519 from yousong/automated-cherry-pick-of-#1517-release-2.10.0
Automated cherry pick of #1517: .circleci: save go cache
2019-07-04 15:30:54 +08:00
Qiu Jian
02b4244ee9 fix: user filter by role 2019-07-04 15:29:57 +08:00
yunion-ci-robot
4de14af7d1 Merge pull request #1538 from swordqiu/automated-cherry-pick-of-#1537-upstream-release-2.10.0
Automated cherry pick of #1537: add ldapcli rpm
2019-07-04 10:29:54 +08:00
Qiu Jian
4d8ec05380 add ldapcli rpm 2019-07-04 10:11:09 +08:00
yunion-ci-robot
ced1363571 Merge pull request #1535 from swordqiu/automated-cherry-pick-of-#1534-upstream-release-2.10.0
Automated cherry pick of #1534: fix: 1. token add projects when no project specified 2. IVirtualResourceManager add GetResourceCount() method 3. domainId not initialized occasionally
2019-07-04 10:02:57 +08:00
yunion-ci-robot
64d3f52e70 Merge pull request #1531 from ioito/automated-cherry-pick-of-#1529-upstream-release-2.10.0
Automated cherry pick of #1529: fix create image with userCred issue
2019-07-03 23:24:55 +08:00
yunion-ci-robot
94690f24fc Merge pull request #1526 from ioito/automated-cherry-pick-of-#1524-upstream-release-2.10.0
Automated cherry pick of #1524: fix azure reserved ips
2019-07-03 23:04:56 +08:00
Qiu Jian
fcaba4875a fix: 1. token add projects when no project specified 2. IVirtualResourceManager add GetResourceCount() method 3. domainId not initialized occasionally 2019-07-03 22:58:22 +08:00
Yousong Zhou
744c27aac4 .circleci: build: save go cache 2019-07-03 13:43:14 +00:00
ioito
b36b8474f8 fix create image with userCred issue 2019-07-03 20:57:15 +08:00
yunion-ci-robot
ca8f6f4a3f Merge pull request #1522 from ioito/automated-cherry-pick-of-#1520-upstream-release-2.10.0
Automated cherry pick of #1520: zstack using shell to init image password
2019-07-03 20:19:54 +08:00
ioito
08ef72f841 fix azure reserved ips 2019-07-03 20:12:06 +08:00
ioito
68d917a7db zstack using shell to init image password 2019-07-03 19:24:15 +08:00
yunion-ci-robot
5eab573eee Merge pull request #1511 from yousong/automated-cherry-pick-of-#1509-release-2.10.0
Automated cherry pick of #1509: pkg: ansible: 改正文件内容写入路径
2019-07-03 18:09:54 +08:00
yunion-ci-robot
bbecc34943 Merge pull request #1514 from wanyaoqi/automated-cherry-pick-of-#1512-upstream-release-2.10.0
Automated cherry pick of #1512: fix image download timout
2019-07-03 18:06:56 +08:00
yunion-ci-robot
601241f744 Merge pull request #1505 from ioito/automated-cherry-pick-of-#1503-upstream-release-2.10.0
Automated cherry pick of #1503: fix cloud-init lock root login issue
2019-07-03 17:44:52 +08:00
wanyaoqi
8a14fced0e fix image download timout 2019-07-03 17:44:27 +08:00
Yousong Zhou
8a5e3da882 pkg: ansible: 改正文件内容写入路径
模板不会在files/目录下寻找

Fixes: 5ec150e7a9 ("pkg: ansible: 添加文件内容支持")
2019-07-03 09:27:21 +00:00
ioito
3344897e13 fix idc sku filter at 2.10.0 2019-07-03 16:30:27 +08:00
ioito
e65a148edb fix cloud-init lock root login issue 2019-07-03 15:55:13 +08:00
yunion-ci-robot
bf65bf77c0 Merge pull request #1480 from ioito/automated-cherry-pick-of-#1479-upstream-release-2.10.0
Automated cherry pick of #1479: fix sync openstack hoststorages issue
2019-07-03 08:33:52 +08:00
yunion-ci-robot
43ddfbd491 Merge pull request #1492 from ioito/automated-cherry-pick-of-#1486-upstream-release-2.10.0
Automated cherry pick of #1486: fix azure set secgroup error
2019-07-03 08:28:52 +08:00
yunion-ci-robot
9de035fde5 Merge pull request #1502 from yousong/automated-cherry-pick-of-#1500-release-2.10.0
Automated cherry pick of #1500: build: mod: 兼容bsd sed
2019-07-03 00:40:51 +08:00
Yousong Zhou
e388de8fed build: mod: 兼容bsd sed 2019-07-02 15:02:23 +00:00
yunion-ci-robot
819674f493 Merge pull request #1497 from wanyaoqi/automated-cherry-pick-of-#1495-upstream-release-2.10.0
Automated cherry pick of #1495: fix export data
2019-07-02 22:09:52 +08:00
wanyaoqi
afbfd101ab fix export data 2019-07-02 22:04:25 +08:00
ioito
73625800fb fix azure set secgroup error 2019-07-02 21:24:29 +08:00
yunion-ci-robot
ecbf7c29a9 Merge pull request #1485 from Zexi/automated-cherry-pick-of-#1484-upstream-release-2.10.0
Automated cherry pick of #1484: scheduler: fix network schedtag not set capacity
2019-07-02 20:38:55 +08:00
Zexi
2dc13a905e scheduler: fix network schedtag not set capacity 2019-07-02 20:35:57 +08:00
ioito
837f46e31a fix sync openstack hoststorages issue 2019-07-02 20:10:28 +08:00
yunion-ci-robot
00803e4ee7 Merge pull request #1476 from swordqiu/automated-cherry-pick-of-#1474-upstream-release-2.10.0
Automated cherry pick of #1474: fix: service catalog nil pointer
2019-07-02 18:53:54 +08:00
yunion-ci-robot
3c78775e15 Merge pull request #1473 from wanyaoqi/automated-cherry-pick-of-#1471-upstream-release-2.10.0
Automated cherry pick of #1471: fix export data, set no limit; expand timeout
2019-07-02 18:49:53 +08:00
Qiu Jian
55c3e67576 fix: service catalog nil pointer 2019-07-02 18:33:00 +08:00
wanyaoqi
c1f988d4ad fix export data, set no limit; expand timeout 2019-07-02 17:57:56 +08:00
yunion-ci-robot
f1644ca567 Merge pull request #1465 from tb365/automated-cherry-pick-of-#1464-upstream-release-2.10.0
Automated cherry pick of #1464: update mod
2019-07-02 16:09:51 +08:00
TangBin
68c9b4e73f update mod 2019-07-02 16:02:58 +08:00
yunion-ci-robot
4af03d1686 Merge pull request #1461 from swordqiu/automated-cherry-pick-of-#1460-upstream-release-2.10.0
Automated cherry pick of #1460: fix: 1. quota add API 2. tenant cache refresh 3. domain quota not initialize
2019-07-02 09:55:51 +08:00
Qiu Jian
0a63f4b017 feature: allow cascade quota set 2019-07-02 09:34:45 +08:00
Qiu Jian
0c2acbf67d fix: 1. quota add API 2. tenant cache refresh 3. domain quota not initialize 2019-07-02 09:34:05 +08:00
yunion-ci-robot
ed22cc1078 Merge pull request #1459 from swordqiu/automated-cherry-pick-of-#1458-upstream-release-2.10.0
Automated cherry pick of #1458: fix: 1. idp sync fail to sync group domainId 2. idp delete fail
2019-07-01 18:54:51 +08:00
yunion-ci-robot
2882952d9f Merge pull request #1455 from wanyaoqi/automated-cherry-pick-of-#1454-upstream-release-2.10.0
Automated cherry pick of #1454: fix dhcp build on OSX
2019-07-01 18:51:53 +08:00
Qiu Jian
c5c3e8acdb fix: generate unique name should exclude existing name 2019-07-01 18:18:36 +08:00
Qiu Jian
611342f6a2 fix: 1. idp sync fail to sync group domainId 2. idp delete fail 2019-07-01 18:18:35 +08:00
yunion-ci-robot
2ab647a173 Merge pull request #1457 from ioito/automated-cherry-pick-of-#1456-upstream-release-2.10.0
Automated cherry pick of #1456: fix attach disk not effect
2019-07-01 18:17:51 +08:00
ioito
314c71cf1d fix attach disk not effect 2019-07-01 15:52:13 +08:00
wanyaoqi
c50ef6be11 fix dhcp build on OSX 2019-07-01 15:09:55 +08:00
yunion-ci-robot
8c1b35cafe Merge pull request #1453 from ioito/automated-cherry-pick-of-#1415-upstream-release-2.10.0
Automated cherry pick of #1415: zone添加GetIVMById,GetIDiskById方法
2019-07-01 12:29:53 +08:00
ioito
b2f336aeb6 zone添加GetIVMById,GetIDiskById方法 2019-07-01 11:47:40 +08:00
yunion-ci-robot
9c2cbe42d5 Merge pull request #1452 from swordqiu/automated-cherry-pick-of-#1451-upstream-release-2.10.0
Automated cherry pick of #1451: fix format
2019-07-01 11:46:51 +08:00
Qiu Jian
0809b69bb4 fix format 2019-07-01 11:41:29 +08:00
yunion-ci-robot
377c79f9aa Merge pull request #1450 from ioito/automated-cherry-pick-of-#1449-upstream-release-2.10.0
Automated cherry pick of #1449: fix nil pointer dereference error
2019-07-01 11:36:51 +08:00
ioito
34738bb516 fix nil pointer dereference error 2019-07-01 11:34:11 +08:00
yunion-ci-robot
6c392f4ae8 Merge pull request #1446 from ioito/automated-cherry-pick-of-#1420-upstream-release-2.10.0
Automated cherry pick of #1420: remove keypair info if rebuild-root net set keypair
2019-07-01 11:19:52 +08:00
ioito
10ffcb073d remove keypair info if rebuild-root net set keypair 2019-07-01 10:26:45 +08:00
yunion-ci-robot
ff0ad6d043 Merge pull request #1443 from swordqiu/automated-cherry-pick-of-#1442-upstream-release-2.10.0
Automated cherry pick of #1442: fix: usage query support brands
2019-07-01 10:11:51 +08:00
yunion-ci-robot
e8ee1c7f53 Merge pull request #1445 from swordqiu/automated-cherry-pick-of-#1440-upstream-release-2.10.0
Automated cherry pick of #1440: feature: 1. esxi vm add resource pool metadata 2. esxicli support network-list 3. add cloud-provider-clirc command to generate rc for each cloud-cli
2019-07-01 10:05:51 +08:00
yunion-ci-robot
d0c96b721f Merge pull request #1444 from swordqiu/automated-cherry-pick-of-#1441-upstream-release-2.10.0
Automated cherry pick of #1441: feature: capability add brands
2019-07-01 10:04:54 +08:00
Qiu Jian
6eafc028ea fix: replace all ext metadata 2019-07-01 09:38:10 +08:00
Qiu Jian
0dcc74ec5f feature: 1. esxi vm add resource pool metadata 2. esxicli support network-list 3. add cloud-provider-clirc command to generate rc for each cloud-cli 2019-07-01 09:38:10 +08:00
Qiu Jian
a7be9437e5 feature: capability add brands 2019-07-01 09:35:49 +08:00
Qiu Jian
bba426e67c fix: usage query support brands 2019-07-01 09:32:49 +08:00
yunion-ci-robot
badf669494 Merge pull request #1436 from tb365/automated-cherry-pick-of-#1435-upstream-release-2.10.0
Automated cherry pick of #1435: fix eip projcet source & snapshot bugfix
2019-06-30 00:25:51 +08:00
yunion-ci-robot
39b8963fc1 Merge pull request #1439 from yousong/automated-cherry-pick-of-#1438-release-2.10.0
Automated cherry pick of #1438: lb: 改正lbcluster校验
2019-06-30 00:24:52 +08:00
Yousong Zhou
d8bc1d40e6 lb: 改正lbcluster校验
- 仅对私有云应用
 - 若显式指定了lbcluster,校验lbcluster.zoneId==network.zone
2019-06-29 13:40:46 +00:00
TangBin
b43ecc4310 fix eip projcet source & snapshot bugfix 2019-06-29 18:11:52 +08:00
yunion-ci-robot
e81ebce304 Merge pull request #1431 from swordqiu/automated-cherry-pick-of-#1428-upstream-release-2.10.0
Automated cherry pick of #1428: fix: 1. ldap sync remove domain/user errors 2. esxi compatibility issues
2019-06-29 14:58:54 +08:00
yunion-ci-robot
bb58bca77f Merge pull request #1433 from Zexi/automated-cherry-pick-of-#1432-upstream-release-2.10.0
Automated cherry pick of #1432: update vendor to fix log caller field missing
2019-06-29 14:54:53 +08:00
Zexi
478ceaee63 update vendor to fix log caller field missing 2019-06-29 14:36:47 +08:00
Qiu Jian
93d759c9f8 fix: 1. ldap sync remove domain/user errors 2. esxi compatibility issues 2019-06-29 14:33:57 +08:00
yunion-ci-robot
a7450aed3b Merge pull request #1427 from yousong/automated-cherry-pick-of-#1421-release-2.10.0
Automated cherry pick of #1421: httperrors: 支持从msgTmpl转换为带%s的msgFmt
2019-06-29 14:32:52 +08:00
yunion-ci-robot
72f312ec11 Merge pull request #1425 from yousong/automated-cherry-pick-of-#1424-release-2.10.0
Automated cherry pick of #1424: build: 移除Gopkg.toml, Gopkg.lock
2019-06-29 14:28:52 +08:00
yunion-ci-robot
9aa2b54b07 Merge pull request #1426 from yousong/automated-cherry-pick-of-#1422-release-2.10.0
Automated cherry pick of #1422: lbclusters: 初次支持
2019-06-29 14:21:52 +08:00
Yousong Zhou
dc36e35c70 validators: errors: 使用msgFmt而非包含{NN}的msgTmpl 2019-06-29 05:22:04 +00:00
Yousong Zhou
2f4c4aed88 httperrors: 支持从msgTmpl转换为带%s的msgFmt 2019-06-29 05:22:04 +00:00
Yousong Zhou
3b10089269 lbclusters: 初次支持 2019-06-29 05:18:30 +00:00
Yousong Zhou
0762de2cd7 .circleci: store_artifacts 2019-06-29 05:10:39 +00:00
Yousong Zhou
866d22fae0 .circleci: bump yunionio/onecloud-ci to version v1.0.2 2019-06-29 05:10:38 +00:00
Yousong Zhou
076314d308 build: docker-build as the first-class citizen 2019-06-29 05:10:38 +00:00
Yousong Zhou
7edcd37dc0 build: 移除Gopkg.toml, Gopkg.lock 2019-06-29 05:10:38 +00:00
yunion-ci-robot
39ff1ddfb6 Merge pull request #1419 from wanyaoqi/automated-cherry-pick-of-#1418-upstream-release-2.10.0
Automated cherry pick of #1418: network filter by part of ip
2019-06-27 19:53:50 +08:00
yunion-ci-robot
7c1ed842ea Merge pull request #1416 from wanyaoqi/automated-cherry-pick-of-#1412-upstream-release-2.10.0
Automated cherry pick of #1412: baremetal listen dhcp port
2019-06-27 18:29:50 +08:00
wanyaoqi
900a939c96 network filter by part of ip 2019-06-27 17:57:02 +08:00
yunion-ci-robot
a6b01b219a Merge pull request #1417 from swordqiu/automated-cherry-pick-of-#1411-upstream-release-2.10.0
Automated cherry pick of #1411: fix: 1. auto create project after import domains 2. add actionlogs for identity resources
2019-06-27 17:33:51 +08:00
yunion-ci-robot
9b98778bff Merge pull request #1414 from ioito/automated-cherry-pick-of-#1407-upstream-release-2.10.0
Automated cherry pick of #1407: private cloud filter eip by zone
2019-06-27 17:32:51 +08:00
yunion-ci-robot
b22236d097 Merge pull request #1405 from yousong/automated-cherry-pick-of-#1404-release-2.10.0
Automated cherry pick of #1404: ansibleserver: 直接指定IP地址时默认ansible_user指定
2019-06-27 17:23:53 +08:00
yunion-ci-robot
bc04f05078 Merge pull request #1401 from yousong/automated-cherry-pick-of-#1400-release-2.10.0
Automated cherry pick of #1400: lbagent: 启动时全量取API数据
2019-06-27 17:20:55 +08:00
yunion-ci-robot
aafc7e7f62 Merge pull request #1397 from ioito/automated-cherry-pick-of-#1396-upstream-release-2.10.0
Automated cherry pick of #1396: wait ready or running after change vm config
2019-06-27 17:17:51 +08:00
yunion-ci-robot
6f9a577cac Merge pull request #1393 from wanyaoqi/automated-cherry-pick-of-#1384-upstream-release-2.10.0
Automated cherry pick of #1384: - live migrate filter cpu model
2019-06-27 16:59:51 +08:00
Qiu Jian
4a527aea0b update vendor 2019-06-27 16:53:35 +08:00
Qiu Jian
8306485468 fix: misc bugfixes. 2019-06-27 16:53:35 +08:00
Qiu Jian
43ce838980 fix: 1. auto create project after import domains 2. add actionlogs for identity resources 2019-06-27 16:53:35 +08:00
wanyaoqi
d4cf2cad57 baremetal listen dhcp port 2019-06-27 16:40:27 +08:00
ioito
1d4cda6557 private cloud filter eip by zone 2019-06-27 15:02:13 +08:00
Zexi Li
8c2344d252 Merge pull request #1406 from Zexi/automated-cherry-pick-of-#1347-upstream-release-2.10.0
Automated cherry pick of #1347: scheduler: add schedule filter interface to guestdriver
2019-06-26 21:25:50 +08:00
Zexi
9c5a471905 scheduler: add schedule filter interface to guestdriver 2019-06-26 21:24:33 +08:00
Yousong Zhou
c9050d44ca ansibleserver: 直接指定IP地址时默认ansible_user指定 2019-06-26 12:59:01 +00:00
Yousong Zhou
3107652757 lbagent: 启动时全量取API数据
此变更之后,data/目录内容更多服务于调试作用
2019-06-26 12:25:52 +00:00
ioito
5b9da4b3ef wait ready or running after change vm config 2019-06-26 19:32:46 +08:00
wanyaoqi
c45f0d4014 optimize sync status with backup 2019-06-26 13:05:48 +08:00
wanyaoqi
5edfbc2636 - live migrate filter cpu model
- fix list export keys
2019-06-26 13:05:47 +08:00
yunion-ci-robot
d06a8ae657 Merge pull request #1390 from wanyaoqi/automated-cherry-pick-of-#1174-upstream-release-2.10.0
Automated cherry pick of #1174: import running libvirt guests
2019-06-26 12:39:50 +08:00
yunion-ci-robot
4800fa858c Merge pull request #1389 from wanyaoqi/automated-cherry-pick-of-#1348-upstream-release-2.10.0
Automated cherry pick of #1348: - add pvpanic device - fix import baremetal server status admin - fix gpu params position, fix notify event - delete unknown guests
2019-06-26 12:38:49 +08:00
wanyaoqi
921499943a import running libvirt guests 2019-06-26 11:20:07 +08:00
wanyaoqi
a6f27f3a90 - add pvpanic device - fix import baremetal server status admin - fix gpu params position, fix notify event - delete unknown guests 2019-06-26 10:58:34 +08:00
yunion-ci-robot
95715fc69d Merge pull request #1377 from tb365/automated-cherry-pick-of-#1376-upstream-release-2.10.0
Automated cherry pick of #1376: ucloud create instance & huawei change instance config bugfix
2019-06-26 08:31:50 +08:00
yunion-ci-robot
5359993489 Merge pull request #1388 from swordqiu/automated-cherry-pick-of-#1387-upstream-release-2.10.0
Automated cherry pick of #1387: fix: initialize system project quota
2019-06-26 08:23:50 +08:00
yunion-ci-robot
2c37dbfbca Merge pull request #1386 from swordqiu/automated-cherry-pick-of-#1385-upstream-release-2.10.0
Automated cherry pick of #1385: fix: 1. role_assignment missing groups 2. project rpcs returns errors
2019-06-26 08:22:49 +08:00
Qiu Jian
5b98028d38 fix: initialize system project quota 2019-06-26 08:12:29 +08:00
Qiu Jian
25254c648a fix: 1. role_assignment missing groups 2. project rpcs returns errors 2019-06-26 00:41:19 +08:00
yunion-ci-robot
7561ffbcb2 Merge pull request #1371 from yousong/feature/yousong-go-mod-2.10
treewide: 2.10引入go modules支持
2019-06-25 23:28:55 +08:00
yunion-ci-robot
bd7572745f Merge pull request #1373 from wanyaoqi/automated-cherry-pick-of-#1357-upstream-release-2.10.0
Automated cherry pick of #1357: set default http client timeout
2019-06-25 23:21:51 +08:00
yunion-ci-robot
57e2396aa5 Merge pull request #1381 from ioito/automated-cherry-pick-of-#1380-upstream-release-2.10.0
Automated cherry pick of #1380: clear scheduler cache afeter change host cmtbound
2019-06-25 23:15:55 +08:00
ioito
d6b783325e clear scheduler cache afeter change host cmtbound 2019-06-25 21:00:49 +08:00
yunion-ci-robot
938424bf7a Merge pull request #1379 from ioito/automated-cherry-pick-of-#1378-upstream-release-2.10.0
Automated cherry pick of #1378: 避免镜像第一次上传时未做缓存
2019-06-25 20:58:49 +08:00
ioito
9092d5bcde 避免镜像第一次上传时未做缓存 2019-06-25 20:51:49 +08:00
TangBin
6fb3e0c98b ucloud create instance & huawei change instance config bugfix 2019-06-25 19:10:35 +08:00
wanyaoqi
c860ca4ed0 set default http client timeout 2019-06-25 15:30:34 +08:00
Yousong Zhou
a3f1098542 build: 改正版本信息注入 2019-06-25 07:21:30 +00:00
Yousong Zhou
1fd7eeb7e9 build: apply "-mod vendor" also to test target 2019-06-25 05:09:57 +00:00
Yousong Zhou
88c0dfeba0 build: fix $(shell go ..) call 2019-06-25 05:09:51 +00:00
Yousong Zhou
a4f0860b60 build: switch to using go mod 2019-06-25 05:09:38 +00:00
Yousong Zhou
977ba2dcce vendor: using go modules
This change was made with the following commands

        go mod init
        go mod tidy
        go mod vendor -v

Revision of github.com/op/go-logging changed because
github.com/anacrolix/torrent requires the current version in its go.mod

        # github.com/op/go-logging
        yunion.io/x/onecloud/cmd/torrent
        github.com/anacrolix/torrent
        github.com/elgatito/upnp
        github.com/op/go-logging

Content of google.golang.org/grpc changed and it's indeed the case after
checking with the upstream repo.  It's very likely that the old content
is wrong.

Some packages like golang.org/x/sys/unix are added because they are
indeeded needed

Some packages are removed as a whole because they are needed anymore
2019-06-25 05:09:07 +00:00
yunion-ci-robot
84ba38e984 Merge pull request #1360 from ioito/automated-cherry-pick-of-#1359-upstream-release-2.10.0
Automated cherry pick of #1359: 替换有远端安全组的规则,避免网络不通
2019-06-25 12:01:50 +08:00
yunion-ci-robot
8cf4fc6230 Merge pull request #1368 from yousong/automated-cherry-pick-of-#1367-release-2.10.0
Automated cherry pick of #1367: lbagents: 改正vrrp模板
2019-06-25 11:45:51 +08:00
Yousong Zhou
203201bda2 validators: 默认将pending deleted的模型排除在外 2019-06-25 02:36:48 +00:00
Yousong Zhou
efaba50fc3 db: 添加IPendingDeletable类型 2019-06-25 02:36:48 +00:00
Yousong Zhou
692675c857 lbagents: 改正vrrp模板 2019-06-25 02:36:47 +00:00
yunion-ci-robot
985941cf32 Merge pull request #1365 from wanyaoqi/automated-cherry-pick-of-#1364-upstream-release-2.10.0
Automated cherry pick of #1364: make dhcp server port optional
2019-06-25 10:35:50 +08:00
yunion-ci-robot
168d9701ef Merge pull request #1362 from swordqiu/automated-cherry-pick-of-#1361-upstream-release-2.10.0
Automated cherry pick of #1361: fix: cloud account syncstatus is not accurate
2019-06-25 08:43:50 +08:00
Qiu Jian
c0fd2c80b9 fix: cloud account syncstatus is not accurate 2019-06-24 22:19:03 +08:00
wanyaoqi
67e0db6fb6 make dhcp server port optional 2019-06-24 20:35:31 +08:00
ioito
595dd97cfa 替换有远端安全组的规则,避免网络不通 2019-06-24 17:37:40 +08:00
yunion-ci-robot
a00867806d Merge pull request #1356 from wanyaoqi/automated-cherry-pick-of-#1336-upstream-release-2.10.0
Automated cherry pick of #1336: dhcp use raw socket vendor update update golang/x/sys
2019-06-24 15:15:49 +08:00
wanyaoqi
5fe178fe19 dhcp use raw socket vendor update update golang/x/sys 2019-06-24 15:01:33 +08:00
yunion-ci-robot
154a658a86 Merge pull request #1351 from swordqiu/automated-cherry-pick-of-#1350-upstream-release-2.10.0
Automated cherry pick of #1350: fix: 1. sync delete projects and related quota&usage data 2. sync delete user/group/domain for ldap driver 3. ModelManager add OrderByExtraFields
2019-06-24 12:42:51 +08:00
yunion-ci-robot
74918c5ae4 Merge pull request #1329 from tb365/automated-cherry-pick-of-#1328-upstream-release-2.10.0
Automated cherry pick of #1328: add init local sku data
2019-06-24 12:41:50 +08:00
Qiu Jian
ef8bf3e844 fix: update gin import 2019-06-24 12:32:49 +08:00
yunion-ci-robot
d08f96f596 Merge pull request #1353 from ioito/automated-cherry-pick-of-#1352-upstream-release-2.10.0
Automated cherry pick of #1352: avoid duplicate network name
2019-06-24 12:32:49 +08:00
Qiu Jian
de3add2d65 update vendor 2019-06-24 12:32:47 +08:00
Qiu Jian
f4b289ffce fix: 1. sync delete projects and related quota&usage data 2. sync delete user/group/domain for ldap driver 3. ModelManager add OrderByExtraFields 2019-06-24 12:31:44 +08:00
ioito
d6584b2553 avoid duplicate network name 2019-06-24 11:22:52 +08:00
yunion-ci-robot
87fedb242c Merge pull request #1349 from wanyaoqi/automated-cherry-pick-of-#1206-upstream-release-2.10.0
Automated cherry pick of #1206: gpfs
2019-06-22 13:00:49 +08:00
wanyaoqi
89e9d83cc1 fix attach storages 2019-06-22 12:51:58 +08:00
wanyaoqi
ead932a0a2 gpfs
- support gpfs
- fix cache non lvm
2019-06-22 12:51:24 +08:00
yunion-ci-robot
cc143b3e72 Merge pull request #1300 from Zexi/automated-cherry-pick-of-#1298-upstream-release-2.10.0
Automated cherry pick of #1298: baremetal: change ipmi user password
2019-06-22 12:45:50 +08:00
yunion-ci-robot
fe13be6d13 Merge pull request #1340 from ioito/automated-cherry-pick-of-#1339-upstream-release-2.10.0
Automated cherry pick of #1339: fix zstack mini disk size
2019-06-22 12:32:49 +08:00
yunion-ci-robot
59319d837f Merge pull request #1332 from yousong/automated-cherry-pick-of-#1271-release-2.10.0
Automated cherry pick of #1271: lbagents: 增加deploy支持
2019-06-22 12:19:49 +08:00
Zexi Li
59ec51770c Merge pull request #1344 from Zexi/automated-cherry-pick-of-#1341-upstream-release-2.10.0
Automated cherry pick of #1341: scheduler: fix prefer avoid score
2019-06-21 14:05:24 +08:00
Zexi
9cd27606ea scheduler: fix prefer avoid score 2019-06-21 13:57:29 +08:00
ioito
ea1625ce61 fix zstack mini disk size 2019-06-21 11:24:12 +08:00
Jian Qiu
9e5df5da0a fix: protect projects with resources in any services (#1338) 2019-06-21 09:09:42 +08:00
yunion-ci-robot
18cfd21b97 Merge pull request #1335 from Zexi/automated-cherry-pick-of-#1334-upstream-release-2.10.0
Automated cherry pick of #1334: scheduler: add image zone filter
2019-06-21 09:08:50 +08:00
Zexi
8416de411d scheduler: add image zone filter 2019-06-20 21:37:11 +08:00
yunion-ci-robot
f58d72d860 Merge pull request #1333 from wanyaoqi/automated-cherry-pick-of-#1330-upstream-release-2.10.0
Automated cherry pick of #1330: remove default listen address
2019-06-20 21:25:50 +08:00
wanyaoqi
4733eb4ffb remove default listen address 2019-06-20 20:45:14 +08:00
Yousong Zhou
3e4636b621 lbagents: 增加deploy支持 2019-06-20 10:12:12 +00:00
Yousong Zhou
afe1fb2165 lb: lbbackendgroups: 去掉多余lbbg.DoPendingDelete() 2019-06-20 10:12:12 +00:00
yunion-ci-robot
fc417aee47 Merge pull request #1225 from yousong/automated-cherry-pick-of-#1223-release-2.10.0
Automated cherry pick of #1223: lb: backends: 仅针对guest类型后端查询vpcId
2019-06-20 17:52:48 +08:00
yunion-ci-robot
15d3b176be Merge pull request #1227 from yousong/automated-cherry-pick-of-#1210-release-2.10.0
Automated cherry pick of #1210: ansibleserver: 在pb执行失败时打出警告日志
2019-06-20 17:50:50 +08:00
Yousong Zhou
0b1f91b847 mcclient: models: 添加ansibleplaybooks 2019-06-20 09:14:55 +00:00
Yousong Zhou
ed4597286d mcclient: ansibleplaybooks: 使用apis.XxxInput 2019-06-20 09:14:55 +00:00
Yousong Zhou
633c3fbd30 apis: add ansible 2019-06-20 09:14:55 +00:00
Yousong Zhou
e84b832282 mcclient: options: ansibleplaybooks: 支持指定文件 2019-06-20 09:14:55 +00:00
Yousong Zhou
421d4bf8db pkg: ansible: 添加文件内容支持 2019-06-20 09:14:55 +00:00
Yousong Zhou
f16913c165 ansibleserver: 在pb执行失败时打出警告日志 2019-06-20 09:14:55 +00:00
yunion-ci-robot
caa9a77e5e Merge pull request #1323 from ioito/automated-cherry-pick-of-#1322-upstream-release-2.10.0
Automated cherry pick of #1322: 避免产生storagecacheimage脏数据
2019-06-20 15:45:48 +08:00
yunion-ci-robot
7856c7f780 Merge pull request #1327 from ioito/automated-cherry-pick-of-#1326-upstream-release-2.10.0
Automated cherry pick of #1326: fix delete rules failure
2019-06-20 15:40:48 +08:00
TangBin
2898bfff6a init skus data filter by region 2019-06-20 11:34:48 +08:00
tangbin
912faadd7b add init local sku data 2019-06-20 11:34:48 +08:00
ioito
8f4af3c7b3 fix delete rules failure 2019-06-20 11:08:33 +08:00
yunion-ci-robot
2920db361e Merge pull request #1325 from swordqiu/automated-cherry-pick-of-#1324-upstream-release-2.10.0
Automated cherry pick of #1324: fix: 1. user-project-list 404 2. check quotas of all projects when set domain quota 3. host.cpu shows negative number
2019-06-20 09:31:49 +08:00
Qiu Jian
6f4a68e21e fix: 1. user-project-list 404 2. check quotas of all projects when set domain quota 3. host.cpu shows negative number 2019-06-20 00:06:52 +08:00
ioito
4b505441b7 避免产生storagecacheimage脏数据 2019-06-19 21:21:19 +08:00
yunion-ci-robot
3e377ffff0 Merge pull request #1318 from wanyaoqi/automated-cherry-pick-of-#1316-upstream-release-2.10.0
Automated cherry pick of #1316: fix storage attach host sync status
2019-06-19 20:17:53 +08:00
wanyaoqi
ffa97dcf82 fix storage attach host sync status 2019-06-19 20:02:00 +08:00
yunion-ci-robot
a67fd9c5cc Merge pull request #1306 from ioito/automated-cherry-pick-of-#1305-upstream-release-2.10.0
Automated cherry pick of #1305: dissocate and release eip optimized\
2019-06-19 18:06:51 +08:00
yunion-ci-robot
86cb77bb6a Merge pull request #1311 from ioito/automated-cherry-pick-of-#1273-upstream-release-2.10.0
Automated cherry pick of #1273: add azure region geographicinfo
2019-06-19 18:02:48 +08:00
yunion-ci-robot
2527b77984 Merge pull request #1315 from ioito/automated-cherry-pick-of-#1314-upstream-release-2.10.0
Automated cherry pick of #1314: fix zstack create account error
2019-06-19 17:57:49 +08:00
ioito
13f7412d6f fix zstack create account error 2019-06-19 17:54:58 +08:00
yunion-ci-robot
c41e7faac3 Merge pull request #1266 from ioito/automated-cherry-pick-of-#1265-upstream-release-2.10.0
Automated cherry pick of #1265: avoid openstack zone externalid equals
2019-06-19 17:46:49 +08:00
yunion-ci-robot
0af400ed00 Merge pull request #1270 from ioito/automated-cherry-pick-of-#1269-upstream-release-2.10.0
Automated cherry pick of #1269: set port when protocol is not any
2019-06-19 17:41:49 +08:00
yunion-ci-robot
6abc204f33 Merge pull request #1302 from ioito/automated-cherry-pick-of-#1301-upstream-release-2.10.0
Automated cherry pick of #1301: fix update zstack account password error
2019-06-19 17:40:49 +08:00
yunion-ci-robot
2aad7f8b84 Merge pull request #1310 from ioito/automated-cherry-pick-of-#1309-upstream-release-2.10.0
Automated cherry pick of #1309: fix invalid memory address or nil pointer error
2019-06-19 17:35:49 +08:00
ioito
c444529690 add azure region geographicinfo 2019-06-19 17:21:53 +08:00
ioito
4eca90b331 fix invalid memory address or nil pointer error 2019-06-19 17:09:35 +08:00
ioito
c696264d17 dissocate and release eip optimized\ 2019-06-19 16:28:37 +08:00
yunion-ci-robot
90e21c3823 Merge pull request #1304 from Zexi/automated-cherry-pick-of-#1303-upstream-release-2.10.0
Automated cherry pick of #1303: region: capabilities add PublicNetworkCount
2019-06-19 15:24:54 +08:00
Zexi
bc4f7a9e10 region: capabilities add PublicNetworkCount 2019-06-19 15:18:38 +08:00
ioito
d07318869a fix update zstack account password error 2019-06-19 15:06:25 +08:00
Zexi
92538dda74 baremetal: change ipmi user password 2019-06-19 11:33:42 +08:00
Jian Qiu
d931a6a067 misc bugfix (#1297) 2019-06-19 02:46:44 +08:00
yunion-ci-robot
9139fecaae Merge pull request #1293 from wanyaoqi/automated-cherry-pick-of-#1292-upstream-release-2.10.0
Automated cherry pick of #1292: unshare projects on change owner
2019-06-18 23:46:56 +08:00
yunion-ci-robot
b199585ebb Merge pull request #1295 from swordqiu/automated-cherry-pick-of-#1294-upstream-release-2.10.0
Automated cherry pick of #1294: fix: user-show system user not found
2019-06-18 23:45:54 +08:00
yunion-ci-robot
29e3e74c84 Merge pull request #1289 from Zexi/automated-cherry-pick-of-#1288-upstream-release-2.10.0
Automated cherry pick of #1288: scheduler: fix shared projects network filtered
2019-06-18 23:44:54 +08:00
Qiu Jian
ea66ba3f0a fix: user-show system user not found 2019-06-18 23:40:26 +08:00
wanyaoqi
c40b544ab0 unshare projects on change owner 2019-06-18 23:25:32 +08:00
yunion-ci-robot
9a42005fd1 Merge pull request #1291 from swordqiu/automated-cherry-pick-of-#1290-upstream-release-2.10.0
Automated cherry pick of #1290: fix: misc bugfxi for quotas
2019-06-18 22:40:55 +08:00
Qiu Jian
52aa709466 fix: misc bugfxi for quotas 2019-06-18 22:37:50 +08:00
Zexi
77185a3922 scheduler: fix shared projects network filtered 2019-06-18 22:23:49 +08:00
yunion-ci-robot
c99869aee6 Merge pull request #1283 from ioito/automated-cherry-pick-of-#1282-upstream-release-2.10.0
Automated cherry pick of #1282: fix zstack storagecache error
2019-06-18 20:22:52 +08:00
yunion-ci-robot
532f374432 Merge pull request #1286 from wanyaoqi/automated-cherry-pick-of-#1255-upstream-release-2.10.0
Automated cherry pick of #1255: fix glance copy from url set checksum
2019-06-18 18:44:52 +08:00
wanyaoqi
2c33aca2b5 fix glance copy from url set checksum 2019-06-18 18:37:10 +08:00
yunion-ci-robot
689c803b34 Merge pull request #1285 from swordqiu/automated-cherry-pick-of-#1284-upstream-release-2.10.0
Automated cherry pick of #1284: fix: add lb and group ip address usage
2019-06-18 18:30:52 +08:00
Qiu Jian
4d673d8d81 fix: add lb and group ip address usage 2019-06-18 18:16:51 +08:00
ioito
749a23864f fix zstack storagecache error 2019-06-18 17:56:51 +08:00
yunion-ci-robot
afb62e8f13 Merge pull request #1279 from wanyaoqi/automated-cherry-pick-of-#1278-upstream-release-2.10.0
Automated cherry pick of #1278: filter storage not attached
2019-06-18 17:22:54 +08:00
wanyaoqi
f82af1da2f filter storage not attached 2019-06-18 16:56:26 +08:00
yunion-ci-robot
14d52679d7 Merge pull request #1277 from swordqiu/automated-cherry-pick-of-#1257-upstream-release-2.10.0
Automated cherry pick of #1257: feature: recode quota, cache quota usage, allow list all project/domain quotas
2019-06-18 12:15:53 +08:00
Qiu Jian
0a76371ad4 fix: misc 2019-06-18 12:09:24 +08:00
Qiu Jian
5436771e81 fix: images quota support 2019-06-18 12:09:24 +08:00
Qiu Jian
8eb2c7af7b feature: recode quota, cache quota usage, allow list all project/domain quotas 2019-06-18 12:09:24 +08:00
Qiu Jian
6547467f31 fix: quota-list includes image quotas 2019-06-18 12:09:24 +08:00
Qiu Jian
ff0ab48953 fix: quota_tbl not initialized 2019-06-18 12:09:24 +08:00
Qiu Jian
bc64f9cd5b fix: images quota support 2019-06-18 12:09:23 +08:00
Qiu Jian
65e0998ab6 feature: recode quota, cache quota usage, allow list all project/domain quotas 2019-06-18 12:09:22 +08:00
Qiu Jian
20d343f126 fix: images quota support 2019-06-18 12:09:22 +08:00
Qiu Jian
b7caca42de feature: recode quota, cache quota usage, allow list all project/domain quotas 2019-06-18 12:09:22 +08:00
yunion-ci-robot
eb1ab003c7 Merge pull request #1264 from swordqiu/automated-cherry-pick-of-#1263-upstream-release-2.10.0
Automated cherry pick of #1263: fix: generate unique name for user totp credential
2019-06-18 11:12:52 +08:00
yunion-ci-robot
794f595136 Merge pull request #1251 from ioito/automated-cherry-pick-of-#1240-upstream-release-2.10.0
Automated cherry pick of #1240: choice valid storage for storagecache
2019-06-18 11:06:52 +08:00
ioito
a5ecc4c52d set port when protocol is not any 2019-06-17 20:57:28 +08:00
ioito
975b82e2ec avoid openstack zone externalid equals 2019-06-17 20:15:50 +08:00
yunion-ci-robot
fc580ea244 Merge pull request #1254 from wanyaoqi/automated-cherry-pick-of-#1073-upstream-release-2.10.0
Automated cherry pick of #1073: register baremetal
2019-06-17 18:19:53 +08:00
Qiu Jian
76f9d0013d fix: generate unique name for user totp credential 2019-06-17 16:45:59 +08:00
yunion-ci-robot
d2860d1f68 Merge pull request #1262 from swordqiu/automated-cherry-pick-of-#1261-upstream-release-2.10.0
Automated cherry pick of #1261: fix: update vendor 20190617
2019-06-17 16:43:54 +08:00
Qiu Jian
06f08ac379 fix: update vendor 20190617 2019-06-17 08:41:36 +00:00
yunion-ci-robot
abf6e431da Merge pull request #1258 from wanyaoqi/automated-cherry-pick-of-#1256-upstream-release-2.10.0
Automated cherry pick of #1256: fix guest sync status interval
2019-06-17 15:51:53 +08:00
wanyaoqi
5b8d090579 fix guest sync status interval 2019-06-17 15:40:27 +08:00
wanyaoqi
6f60ce4cb8 register baremetal 2019-06-17 12:51:57 +08:00
Yousong Zhou
9bf29057c1 pkg: atexit: 增加自定义类型prio 2019-06-17 03:45:27 +00:00
Yousong Zhou
086ba13055 lb: backends: 清理后端虚机已删除的backend 2019-06-17 03:45:27 +00:00
Yousong Zhou
36a890d686 pkg: atexit: 增加PRIO_LOG_OTHER 2019-06-17 03:45:27 +00:00
Yousong Zhou
9ed6b66c46 lb: backends: 仅针对guest类型后端查询vpcId 2019-06-17 03:45:27 +00:00
ioito
da7455e22e choice valid storage for storagecache 2019-06-17 10:15:25 +08:00
Zexi Li
9ef9116862 Merge pull request #1222 from Zexi/automated-cherry-pick-of-#1221-upstream-release-2.10.0
Automated cherry pick of #1221: climc: k8s yaml edit
2019-06-17 10:04:39 +08:00
yunion-ci-robot
10b62ba27e Merge pull request #1250 from wanyaoqi/automated-cherry-pick-of-#1248-upstream-release-2.10.0
Automated cherry pick of #1248: fix share resource left join
2019-06-16 23:32:53 +08:00
wanyaoqi
d17a76756e fix share resource left join 2019-06-16 23:24:26 +08:00
yunion-ci-robot
af73a697fa Merge pull request #1247 from swordqiu/automated-cherry-pick-of-#1246-upstream-release-2.10.0
Automated cherry pick of #1246: fix: network is_public init value set to true for domain scope
2019-06-16 22:20:53 +08:00
Qiu Jian
5d28749920 fix: network is_public init value set to true for domain scope 2019-06-16 22:16:49 +08:00
yunion-ci-robot
1c18f32dc9 Merge pull request #1245 from wanyaoqi/automated-cherry-pick-of-#1244-upstream-release-2.10.0
Automated cherry pick of #1244: fix clean sched cache
2019-06-16 21:57:53 +08:00
wanyaoqi
f2595079df fix clean sched cache 2019-06-16 21:55:22 +08:00
yunion-ci-robot
989cc41202 Merge pull request #1226 from yousong/automated-cherry-pick-of-#1220-release-2.10.0
Automated cherry pick of #1220: cloudaccounts: 检查删除条件时避免不必要log
2019-06-16 21:07:52 +08:00
yunion-ci-robot
88249e0515 Merge pull request #1243 from wanyaoqi/automated-cherry-pick-of-#1234-upstream-release-2.10.0
Automated cherry pick of #1234: fix shared projects
2019-06-16 21:06:53 +08:00
wanyaoqi
2b38051813 fix shared projects 2019-06-16 20:58:55 +08:00
yunion-ci-robot
070c052634 Merge pull request #1239 from ioito/automated-cherry-pick-of-#1238-upstream-release-2.10.0
Automated cherry pick of #1238: secgroup-list remove rules
2019-06-16 20:57:52 +08:00
yunion-ci-robot
4bd75b6b09 Merge pull request #1242 from ioito/automated-cherry-pick-of-#1241-upstream-release-2.10.0
Automated cherry pick of #1241: fix guest-order-by-disk error
2019-06-16 20:55:52 +08:00
ioito
9e8de079c2 fix guest-order-by-disk error 2019-06-16 19:36:14 +08:00
ioito
07b5ef66d0 secgroup-list remove rules 2019-06-16 18:49:32 +08:00
yunion-ci-robot
1f4603b2db Merge pull request #1237 from swordqiu/automated-cherry-pick-of-#1236-upstream-release-2.10.0
Automated cherry pick of #1236: fix: update vendor
2019-06-16 18:09:52 +08:00
Qiu Jian
ba67b3cd12 fix: update vendor 2019-06-16 18:05:57 +08:00
yunion-ci-robot
348a1f0b17 Merge pull request #1235 from ioito/automated-cherry-pick-of-#1228-upstream-release-2.10.0
Automated cherry pick of #1228: fix zstack cdrome error
2019-06-16 18:04:51 +08:00
ioito
4e34a37f75 fix zstack cdrome error 2019-06-16 17:31:23 +08:00
yunion-ci-robot
f7c2a9c0cf Merge pull request #1233 from swordqiu/automated-cherry-pick-of-#1232-upstream-release-2.10.0
Automated cherry pick of #1232: fix: no need to specify query scope when get with parameters
2019-06-16 15:09:51 +08:00
Qiu Jian
67845b0734 fix: no need to specify query scope when get with parameters 2019-06-16 15:07:14 +08:00
yunion-ci-robot
bdfc41933f Merge pull request #1229 from wanyaoqi/automated-cherry-pick-of-#1224-upstream-release-2.10.0
Automated cherry pick of #1224: shared project resource
2019-06-16 14:31:52 +08:00
wanyaoqi
f62aa3d428 shared project resource 2019-06-16 14:29:28 +08:00
Yousong Zhou
0f381cf0b3 cloudaccounts: 检查删除条件时避免不必要log
应由调用方决定是否需要log
2019-06-15 14:04:58 +00:00
yunion-ci-robot
295aa0059b Merge pull request #1213 from ioito/automated-cherry-pick-of-#1196-upstream-release-2.10.0
Automated cherry pick of #1196: fix balance permission error
2019-06-15 21:38:51 +08:00
yunion-ci-robot
3147c69999 Merge pull request #1212 from ioito/automated-cherry-pick-of-#1211-upstream-release-2.10.0
Automated cherry pick of #1211: show error with context
2019-06-15 21:18:52 +08:00
Zexi
2af483ce17 climc: k8s yaml edit 2019-06-15 18:19:17 +08:00
yunion-ci-robot
e313d44f4e Merge pull request #1219 from Zexi/automated-cherry-pick-of-#1218-upstream-release-2.10.0
Automated cherry pick of #1218: scheduler: fix network filter specify is_public check
2019-06-15 17:26:52 +08:00
Zexi
556eef0dd6 scheduler: fix network filter specify is_public check 2019-06-15 17:23:55 +08:00
yunion-ci-robot
6c5bbbf8d7 Merge pull request #1205 from swordqiu/automated-cherry-pick-of-#1204-upstream-release-2.10.0
Automated cherry pick of #1204: fix: fail to list joint virtaul resource of other domain
2019-06-15 16:56:52 +08:00
yunion-ci-robot
ae76f47de0 Merge pull request #1203 from swordqiu/automated-cherry-pick-of-#1202-upstream-release-2.10.0
Automated cherry pick of #1202: fix: cloud-region/zone add domain&scope filter
2019-06-15 16:55:53 +08:00
Zexi Li
dd22086ad0 Merge pull request #1217 from Zexi/automated-cherry-pick-of-#1216-upstream-release-2.10.0
Automated cherry pick of #1216: scheduler: set input networks domain if empty
2019-06-15 15:36:48 +08:00
Zexi
8f5a596a2e scheduler: set input networks domain if empty 2019-06-15 15:31:05 +08:00
ioito
f7aec45099 fix balance permission error 2019-06-15 13:52:39 +08:00
ioito
da89550286 show error with context 2019-06-15 13:39:33 +08:00
yunion-ci-robot
7e7f7083b5 Merge pull request #1185 from tb365/automated-cherry-pick-of-#1184-upstream-release-2.10.0
Automated cherry pick of #1184: qcloud elb create bugfix & ucloud bugfix
2019-06-15 10:40:51 +08:00
yunion-ci-robot
e27d533b58 Merge pull request #1207 from yousong/automated-cherry-pick-of-#1201-release-2.10.0
Automated cherry pick of #1201: cloudcommon: 移除非必要日志
2019-06-15 10:16:52 +08:00
Yousong Zhou
39a5a85f95 cloudcommon: 移除非必要日志 2019-06-14 13:29:04 +00:00
yunion-ci-robot
e59472f251 Merge pull request #1198 from wanyaoqi/automated-cherry-pick-of-#1197-upstream-release-2.10.0
Automated cherry pick of #1197: remove qemu kbd argument
2019-06-14 20:35:52 +08:00
Qiu Jian
86813a5e40 fix: fail to list joint virtaul resource of other domain 2019-06-14 20:24:48 +08:00
Qiu Jian
cfe037522d fix: cloud-region/zone add domain&scope filter 2019-06-14 18:16:38 +08:00
yunion-ci-robot
858852c96e Merge pull request #1200 from ioito/automated-cherry-pick-of-#1199-upstream-release-2.10.0
Automated cherry pick of #1199: create disk and wait disk status is ready
2019-06-14 16:09:51 +08:00
ioito
045e986ff4 create disk and wait disk status is ready 2019-06-14 16:05:28 +08:00
wanyaoqi
afeaeb598d remove qemu kbd argument 2019-06-14 13:43:40 +08:00
yunion-ci-robot
73cd37d1aa Merge pull request #1195 from swordqiu/automated-cherry-pick-of-#1194-upstream-release-2.10.0
Automated cherry pick of #1194: fix: sync network publicScope
2019-06-14 12:03:52 +08:00
yunion-ci-robot
2d58bc129e Merge pull request #1193 from Zexi/automated-cherry-pick-of-#1192-upstream-release-2.10.0
Automated cherry pick of #1192: scheduler: network domain scope filter
2019-06-14 12:02:51 +08:00
Qiu Jian
2ca0f9aa20 fix: sync network publicScope 2019-06-14 11:59:22 +08:00
Zexi
5fa6d5fce6 scheduler: network domain scope filter 2019-06-14 10:28:34 +08:00
yunion-ci-robot
51c80309f6 Merge pull request #1190 from Zexi/automated-cherry-pick-of-#1189-upstream-release-2.10.0
Automated cherry pick of #1189: scheduler: select networks by project domain order
2019-06-13 21:55:51 +08:00
Zexi
56e4c080d9 scheduler: select networks by project domain order 2019-06-13 21:52:31 +08:00
yunion-ci-robot
c92b9d3a60 Merge pull request #1188 from swordqiu/automated-cherry-pick-of-#1187-upstream-release-2.10.0
Automated cherry pick of #1187: fix: change domain to project_domain
2019-06-13 21:40:52 +08:00
Qiu Jian
b1d6ddec3d fix: change domain to project_domain 2019-06-13 21:11:00 +08:00
yunion-ci-robot
b06548c3e6 Merge pull request #1181 from ioito/automated-cherry-pick-of-#1180-upstream-release-2.10.0
Automated cherry pick of #1180: fix typo code
2019-06-13 20:41:53 +08:00
yunion-ci-robot
ee2f2f4a2f Merge pull request #1183 from swordqiu/automated-cherry-pick-of-#1182-upstream-release-2.10.0
Automated cherry pick of #1182: fix: role-list missing shared roles
2019-06-13 20:39:52 +08:00
TangBin
b826c6e1ff qcloud elb create bugfix & ucloud bugfix 2019-06-13 20:36:41 +08:00
Qiu Jian
cae068b049 fix: role-list missing shared roles 2019-06-13 20:01:26 +08:00
ioito
36b0e20fa7 fix typo code 2019-06-13 19:49:27 +08:00
yunion-ci-robot
0022264c1b Merge pull request #1163 from yousong/automated-cherry-pick-of-#1147-release-2.10.0
Automated cherry pick of #1147: ansibleserver: 创建opslog表
2019-06-13 16:24:51 +08:00
yunion-ci-robot
889cddc5a4 Merge pull request #1157 from ioito/automated-cherry-pick-of-#1086-upstream-release-2.10.0
Automated cherry pick of #1086: 创建完磁盘后attach guest
2019-06-13 16:21:53 +08:00
yunion-ci-robot
6cd597c333 Merge pull request #1179 from Zexi/automated-cherry-pick-of-#1178-upstream-release-2.10.0
Automated cherry pick of #1178: virtual resource details rename domain to project_domain
2019-06-13 16:19:51 +08:00
Zexi
ed46ba92ca virtual resource details rename domain to project_domain 2019-06-13 16:15:24 +08:00
yunion-ci-robot
09f6a06c87 Merge pull request #1177 from Zexi/automated-cherry-pick-of-#1176-upstream-release-2.10.0
Automated cherry pick of #1176: region: fix pending_deleted virtual resource filter by name
2019-06-13 15:24:52 +08:00
Zexi
4da94c7e4d region: fix pending_deleted virtual resource filter by name 2019-06-13 15:18:42 +08:00
yunion-ci-robot
6f2026f058 Merge pull request #1169 from yousong/automated-cherry-pick-of-#1168-release-2.10.0
Automated cherry pick of #1168: webconsole: 改正文件权限
2019-06-13 14:23:53 +08:00
yunion-ci-robot
4cd23ac007 Merge pull request #1173 from swordqiu/automated-cherry-pick-of-#1172-upstream-release-2.10.0
Automated cherry pick of #1172: fix: 1. project add user/group rpc paramter error 2. secgrouprule 403 3.
2019-06-13 14:12:53 +08:00
Qiu Jian
0714b3ed50 fix: 1. project add user/group rpc paramter error 2. secgrouprule 403 3. 2019-06-13 14:09:56 +08:00
Yousong Zhou
13639afefd webconsole: 改正文件权限
- 密钥不需要执行权限
 - 先改权限再写内容
2019-06-12 10:27:10 +00:00
yunion-ci-robot
55c813c5aa Merge pull request #1165 from ioito/automated-cherry-pick-of-#1164-upstream-release-2.10.0
Automated cherry pick of #1164: 添加vpc操作日志
2019-06-12 18:02:52 +08:00
ioito
c3875302c4 添加vpc操作日志 2019-06-12 16:59:00 +08:00
Yousong Zhou
e25f38695d build: 添加ansibleserver 2019-06-12 08:19:13 +00:00
Yousong Zhou
0cfb162300 ansibleserver: 使用API查sshkeypairs 2019-06-12 08:19:13 +00:00
Yousong Zhou
2999d6001d mcclient: models: 添加SshKeypair 2019-06-12 08:19:12 +00:00
Yousong Zhou
74465c44e6 mcclient: sshkeypairs: 允许参数为nil 2019-06-12 08:19:12 +00:00
Yousong Zhou
236333a5da ansibleserver: 避免持锁不释放的情况 2019-06-12 08:19:12 +00:00
Yousong Zhou
eb535a3054 ansibleserver: 创建opslog表 2019-06-12 08:19:12 +00:00
yunion-ci-robot
21f9f67755 Merge pull request #1154 from ioito/automated-cherry-pick-of-#1120-upstream-release-2.10.0
Automated cherry pick of #1120: network创建或删除后刷新调度缓存
2019-06-12 15:25:52 +08:00
yunion-ci-robot
09f3352edb Merge pull request #1159 from wanyaoqi/automated-cherry-pick-of-#1158-upstream-release-2.10.0
Automated cherry pick of #1158: fix attach able storage
2019-06-12 14:43:52 +08:00
wanyaoqi
fd8aa826e2 fix attach able storage 2019-06-12 13:54:32 +08:00
yunion-ci-robot
c790d2e35c Merge pull request #1153 from Zexi/automated-cherry-pick-of-#1152-upstream-release-2.10.0
Automated cherry pick of #1152: scheduler: support sharable candidate
2019-06-12 11:50:52 +08:00
ioito
047dd93df3 创建完磁盘后attach guest 2019-06-12 11:44:24 +08:00
ioito
04ee6d6d59 network创建或删除后刷新调度缓存 2019-06-12 11:38:00 +08:00
Zexi
aca63eb14f scheduler: support sharable candidate 2019-06-12 11:35:28 +08:00
yunion-ci-robot
482451851e Merge pull request #1148 from swordqiu/automated-cherry-pick-of-#1146-upstream-release-2.10.0
Automated cherry pick of #1146: fix: 1. capability privilege interface bugfix 2. cloud-provider privilege issue
2019-06-12 09:42:52 +08:00
yunion-ci-robot
5a0d147b8e Merge pull request #1150 from zhasm/automated-cherry-pick-of-#1149-upstream-release-2.10.0
Automated cherry pick of #1149: +ansibleserver
2019-06-12 09:33:50 +08:00
Zhang Dongliang
ee016ef207 +ansibleserver 2019-06-12 09:29:20 +08:00
yunion-ci-robot
bc27a1f383 Merge pull request #1117 from ioito/automated-cherry-pick-of-#1116-upstream-release-2.10.0
Automated cherry pick of #1116: fix qcloud disk create name error
2019-06-12 09:04:52 +08:00
Qiu Jian
d392f41a55 fix: 1. capability privilege interface bugfix 2. cloud-provider privilege issue 2019-06-12 09:00:37 +08:00
yunion-ci-robot
5dc4277bef Merge pull request #1133 from yousong/automated-cherry-pick-of-#910-release-2.10.0
Automated cherry pick of #910: ansible服务化
2019-06-12 08:37:50 +08:00
yunion-ci-robot
5a018efb9d Merge pull request #1145 from Zexi/automated-cherry-pick-of-#1144-upstream-release-2.10.0
Automated cherry pick of #1144: fix: region disk create domain id
2019-06-11 23:11:53 +08:00
yunion-ci-robot
205c56b1b6 Merge pull request #1139 from yousong/automated-cherry-pick-of-#1130-release-2.10.0
Automated cherry pick of #1130: networks: merge与split时将lbnetwork考虑进去
2019-06-11 23:04:53 +08:00
Zexi
7acbb3976c fix: region disk create domain id 2019-06-11 23:01:07 +08:00
yunion-ci-robot
75939d52f3 Merge pull request #1143 from Zexi/automated-cherry-pick-of-#1142-upstream-release-2.10.0
Automated cherry pick of #1142: scheduler: misc bugfix
2019-06-11 20:33:52 +08:00
yunion-ci-robot
4960c7f54e Merge pull request #1136 from wanyaoqi/automated-cherry-pick-of-#1135-upstream-release-2.10.0
Automated cherry pick of #1135: fix disk delete task base
2019-06-11 20:32:54 +08:00
Zexi
2b4d801ee9 scheduler: misc bugfix
- wait region db sync
- disk schedule filter by domain
- normal user forecast 403 forbidden
2019-06-11 20:31:14 +08:00
Yousong Zhou
4b1ec8325e networks: merge与split时将lbnetwork考虑进去
- 共用代码,并放到独立的文件中
 - 尽力更新,中途出错不中断,最后一起报出
2019-06-11 06:10:26 +00:00
wanyaoqi
cfa66ce805 fix disk delete task base 2019-06-11 11:05:53 +08:00
yunion-ci-robot
083bc1caa5 Merge pull request #1132 from swordqiu/automated-cherry-pick-of-#1131-upstream-release-2.10.0
Automated cherry pick of #1131: fix: 1. zone/region capability containts by domain 2. yunionconf query scope fixes
2019-06-11 09:46:51 +08:00
yunion-ci-robot
8f2949409d Merge pull request #1112 from swordqiu/automated-cherry-pick-of-#1111-upstream-release-2.10.0
Automated cherry pick of #1111: fix: image-show missing can-delete/can-update fields
2019-06-11 09:45:51 +08:00
Qiu Jian
f7453b3796 fix: image header encode extra property string 2019-06-11 09:42:49 +08:00
Qiu Jian
cf467e85f9 fix: image-show missing can-delete/can-update fields 2019-06-11 09:42:49 +08:00
yunion-ci-robot
e4d658ef84 Merge pull request #1126 from ioito/automated-cherry-pick-of-#1121-upstream-release-2.10.0
Automated cherry pick of #1121: 添加brand字段限制
2019-06-11 08:52:50 +08:00
Yousong Zhou
6b35141381 ansibleserver: as a separate service 2019-06-11 00:29:55 +00:00
Yousong Zhou
8949895cda climc: add ansibleplaybook-xxx commands 2019-06-11 00:29:55 +00:00
Yousong Zhou
0d9f757bf7 region: add ansibleplaybooks 2019-06-11 00:29:55 +00:00
Yousong Zhou
24b3bcce21 pkg: ansible: add inventory, module, playbook 2019-06-11 00:29:55 +00:00
Yousong Zhou
30dbfad3f2 vendor: update github.com/pkg/errors
Add WithMessagef()
2019-06-11 00:29:55 +00:00
Yousong Zhou
3eaae176a4 climc: ansible-hosts: print newline at the end 2019-06-11 00:29:55 +00:00
Yousong Zhou
a8bb6e741f validators: add SetParent() 2019-06-11 00:29:55 +00:00
Yousong Zhou
3d49777d0f guests: add guest.GetPrivateIPs() 2019-06-11 00:29:55 +00:00
Qiu Jian
dd158aa439 fix: 1. zone/region capability containts by domain 2. yunionconf query scope fixes 2019-06-11 01:33:06 +08:00
Zexi Li
c179a91f35 Merge pull request #1128 from Zexi/automated-cherry-pick-of-#1127-upstream-release-2.10.0
Automated cherry pick of #1127: scheduler: add domain filter
2019-06-10 19:47:36 +08:00
Zexi
725c82152e scheduler: add domain filter 2019-06-10 19:44:43 +08:00
ioito
f68d13db7c 添加brand字段限制 2019-06-10 19:16:03 +08:00
yunion-ci-robot
30d71a95b4 Merge pull request #1115 from Zexi/automated-cherry-pick-of-#1114-upstream-release-2.10.0
Automated cherry pick of #1114: scheduler: host filter by cloudprovider domain id
2019-06-10 19:09:50 +08:00
yunion-ci-robot
0b6bef9328 Merge pull request #1061 from Zexi/automated-cherry-pick-of-#1054-upstream-release-2.10.0
Automated cherry pick of #1054: fix: baremetal raid logical volume and block device map
2019-06-10 19:06:52 +08:00
Zexi
89bb4413dd fix: baremetal find incorrect root disk 2019-06-10 18:01:05 +08:00
Zexi Li
91a691ea61 Merge pull request #1123 from Zexi/automated-cherry-pick-of-#1122-upstream-release-2.10.0
Automated cherry pick of #1122: scheduler: recover panic when stop timer
2019-06-10 17:14:24 +08:00
Zexi
d3c9ab3730 scheduler: recover panic when stop timer 2019-06-10 17:12:45 +08:00
ioito
cd05218a64 fix qcloud disk create name error 2019-06-10 16:04:26 +08:00
Zexi
a9b90d80ef scheduler: host filter by cloudprovider domain id 2019-06-10 12:20:24 +08:00
yunion-ci-robot
a627fdc3ba Merge pull request #1108 from wanyaoqi/automated-cherry-pick-of-#1099-upstream-release-2.10.0
Automated cherry pick of #1099: fix reserved memory
2019-06-09 23:01:51 +08:00
wanyaoqi
e134b16302 fix disk delete 2019-06-09 22:58:03 +08:00
wanyaoqi
f61cbb91d0 fix reserved memory 2019-06-09 22:58:03 +08:00
yunion-ci-robot
9430c20cb9 Merge pull request #1107 from Zexi/automated-cherry-pick-of-#1104-upstream-release-2.10.0
Automated cherry pick of #1104: fix: disk input erase storage_id by backend
2019-06-09 11:18:51 +08:00
Zexi
ad7bd4b7a5 fix: disk input erase storage_id by backend 2019-06-09 11:03:47 +08:00
yunion-ci-robot
02c103cffc Merge pull request #1101 from wanyaoqi/automated-cherry-pick-of-#1100-upstream-release-2.10.0
Automated cherry pick of #1100: gpfs
2019-06-09 00:59:53 +08:00
Jian Qiu
c927afceda Automated cherry pick of #1097: fix: 1. 403 on zone/capabilities, parameters (#1098)
* fix: 1. 403 on zone/capabilities, parameters

* fix keystone authenticate error

* fix: endpoint add type console
2019-06-09 00:54:46 +08:00
yunion-ci-robot
3660355deb Merge pull request #1093 from ioito/automated-cherry-pick-of-#1092-upstream-release-2.10.0
Automated cherry pick of #1092: 修复参数赋值问题
2019-06-06 23:24:52 +08:00
wanyaoqi
7a6d766bde gpfs 2019-06-06 23:17:35 +08:00
yunion-ci-robot
f3b6eef9b3 Merge pull request #1051 from tb365/automated-cherry-pick-of-#1050-upstream-release-2.10.0
Automated cherry pick of #1050: ucloud image upload bugfix & storage type fix
2019-06-06 20:09:50 +08:00
TangBin
9a8d88abe6 fmt import 2019-06-06 20:03:26 +08:00
TangBin
db5954365f ucloud image upload bugfix & storage type fix 2019-06-06 20:03:26 +08:00
yunion-ci-robot
7e082a750a Merge pull request #1096 from yousong/automated-cherry-pick-of-#1091-upstream-release-2.10.0
Automated cherry pick of #1091: README.md: 适应travis迁移至travis-ci.com
2019-06-06 19:53:51 +08:00
Yousong Zhou
5eeb1f1f1b README.md: 添加文档链接 2019-06-06 11:40:01 +00:00
Yousong Zhou
01bf2e592d README.md: 适应travis迁移至travis-ci.com 2019-06-06 11:40:01 +00:00
ioito
7d80096243 修复参数赋值问题 2019-06-06 18:13:33 +08:00
yunion-ci-robot
fb6565af39 Merge pull request #1088 from swordqiu/automated-cherry-pick-of-#1087-upstream-release-2.10.0
Automated cherry pick of #1087: fix: numerous incorrect privilege issues
2019-06-06 10:24:50 +08:00
Qiu Jian
ca32292d42 fix: pending_delete/system list options no need admin params 2019-06-06 08:34:13 +08:00
Qiu Jian
ed49732027 fix: numerous incorrect privilege issues 2019-06-06 08:34:13 +08:00
yunion-ci-robot
7b65e12dee Merge pull request #1085 from wanyaoqi/automated-cherry-pick-of-#1084-upstream-release-2.10.0
Automated cherry pick of #1084: fix exsi encrypt base64
2019-06-05 22:08:51 +08:00
wanyaoqi
5ec94babd1 fix exsi encrypt base64 2019-06-05 22:02:37 +08:00
yunion-ci-robot
16a8070f54 Merge pull request #1077 from ioito/automated-cherry-pick-of-#1076-upstream-release-2.10.0
Automated cherry pick of #1076: 避免OpenStack为设置默认值,导致认证失败
2019-06-05 20:17:50 +08:00
yunion-ci-robot
2b38dc34cb Merge pull request #1079 from ioito/automated-cherry-pick-of-#1078-upstream-release-2.10.0
Automated cherry pick of #1078: 修复deleted disk无法删除问题
2019-06-05 20:16:49 +08:00
yunion-ci-robot
87007f0915 Merge pull request #1083 from ioito/automated-cherry-pick-of-#1082-upstream-release-2.10.0
Automated cherry pick of #1082: 适配最新版cloud-init
2019-06-05 20:12:50 +08:00
ioito
20143c0f59 适配最新版cloud-init 2019-06-05 20:08:10 +08:00
yunion-ci-robot
af2e09cc65 Merge pull request #1081 from tb365/automated-cherry-pick-of-#1080-upstream-release-2.10.0
Automated cherry pick of #1080: image upload remove os type
2019-06-05 17:51:50 +08:00
TangBin
fe2a389353 image upload remove os type 2019-06-05 17:46:21 +08:00
ioito
10caa5c6dc 补充删除镜像方法 2019-06-05 17:30:48 +08:00
ioito
7f3691786b 修复deleted disk无法删除问题 2019-06-05 17:30:48 +08:00
ioito
3630033470 避免OpenStack为设置默认值,导致认证失败 2019-06-05 16:57:23 +08:00
yunion-ci-robot
1de294b625 Merge pull request #1075 from ioito/automated-cherry-pick-of-#1074-upstream-release-2.10.0
Automated cherry pick of #1074: cachedimage-filter-by-region-or-zone
2019-06-05 15:51:52 +08:00
ioito
bf36c14c20 cachedimage-filter-by-region-or-zone 2019-06-05 15:49:12 +08:00
yunion-ci-robot
4c3d83ef95 Merge pull request #1070 from Zexi/automated-cherry-pick-of-#1068-upstream-release-2.10.0
Automated cherry pick of #1068: fix: baremetal MegaRaid mul adapter parse error
2019-06-05 10:35:50 +08:00
yunion-ci-robot
2e65f47030 Merge pull request #1072 from wanyaoqi/automated-cherry-pick-of-#1071-upstream-release-2.10.0
Automated cherry pick of #1071: add normal notofy
2019-06-05 10:32:51 +08:00
wanyaoqi
8652ce9b12 add normal notofy 2019-06-05 10:30:20 +08:00
Zexi
a3dbcf55f0 fix: baremetal MegaRaid mul adapter parse error 2019-06-05 10:29:28 +08:00
yunion-ci-robot
a8de9f5d88 Merge pull request #1065 from yousong/automated-cherry-pick-of-#1063-upstream-release-2.10.0
Automated cherry pick of #1063: cloudproviders: 调整lb资源清理顺序
2019-06-05 10:02:50 +08:00
Yousong Zhou
350c461239 cloudproviders: 调整lb资源清理顺序
lbbg可能被lblis引用,应先清理lblis,再清理lbbg
2019-06-04 17:06:19 +00:00
Yousong Zhou
c8d964295e Merge pull request #1060 from ioito/automated-cherry-pick-of-#1059-upstream-release-2.10.0
Automated cherry pick of #1059: 避免未设置hypervisor导致创建磁盘失败
2019-06-05 01:02:20 +08:00
Yousong Zhou
5d269c575d Merge pull request #1049 from swordqiu/automated-cherry-pick-of-#1048-upstream-release-2.10.0
Automated cherry pick of #1048: hotfix: support scope list filter, resolve filter conflict
2019-06-05 00:39:29 +08:00
yunion-ci-robot
8e5da1cef3 Merge pull request #1058 from ioito/automated-cherry-pick-of-#1057-upstream-release-2.10.0
Automated cherry pick of #1057: 修复zstack绑定多个storage时重复创建disk问题
2019-06-05 00:06:49 +08:00
yunion-ci-robot
e7a0596a81 Merge pull request #1056 from ioito/automated-cherry-pick-of-#1055-upstream-release-2.10.0
Automated cherry pick of #1055: support filter by OneCloud brand
2019-06-04 23:37:50 +08:00
Qiu Jian
6c31178c05 update vendor 2019-06-04 23:29:39 +08:00
Qiu Jian
b9989907d4 fix: bugs in scope support 2019-06-04 23:29:39 +08:00
Qiu Jian
e0c202e346 hotfix: support scope list filter, resolve filter conflict 2019-06-04 23:29:39 +08:00
ioito
62baf971c2 避免未设置hypervisor导致创建磁盘失败 2019-06-04 21:24:09 +08:00
ioito
d94b0e1751 修复zstack绑定多个storage时重复创建disk问题 2019-06-04 20:21:55 +08:00
ioito
79aa2a4446 support filter by OneCloud brand 2019-06-04 19:35:01 +08:00
yunion-ci-robot
dec14853cc Merge pull request #1053 from tb365/automated-cherry-pick-of-#1052-upstream-release-2.10.0
Automated cherry pick of #1052: httperror-set-header-fix
2019-06-04 11:17:57 +08:00
TangBin
c5d5bd5c76 httperror-set-header-fix 2019-06-04 11:11:28 +08:00
yunion-ci-robot
114534bf6d Merge pull request #1043 from ioito/automated-cherry-pick-of-#1042-upstream-release-2.10.0
Automated cherry pick of #1042: 避免级联镜像分类不一致
2019-06-04 09:08:56 +08:00
yunion-ci-robot
cf0130d191 Merge pull request #1047 from tb365/automated-cherry-pick-of-#1046-upstream-release-2.10.0
Automated cherry pick of #1046: parameter create fix
2019-06-03 19:10:56 +08:00
TangBin
6a5ec46031 parameter model GetOwnerId fix 2019-06-03 19:08:13 +08:00
TangBin
b495c14cfa parameter create fix && itsm add quick complete method 2019-06-03 19:08:13 +08:00
TangBin
73a13847b4 parameter create fix 2019-06-03 19:08:13 +08:00
yunion-ci-robot
cc3951bb57 Merge pull request #1028 from ioito/automated-cherry-pick-of-#1024-upstream-release-2.10.0
Automated cherry pick of #1024: 避免未使用最优storage
2019-06-03 18:20:56 +08:00
yunion-ci-robot
657a3048c3 Merge pull request #1039 from wanyaoqi/automated-cherry-pick-of-#1038-upstream-release-2.10.0
Automated cherry pick of #1038: fix imported bm server start
2019-06-03 18:07:55 +08:00
yunion-ci-robot
99fa676b17 Merge pull request #1045 from swordqiu/automated-cherry-pick-of-#1044-upstream-release-2.10.0
Automated cherry pick of #1044: fix: server-disk-list failed on wrong field name
2019-06-03 17:30:56 +08:00
Qiu Jian
3812bb43af fix: server-disk-list failed on wrong field name 2019-06-03 17:24:18 +08:00
ioito
0223a57197 避免级联镜像分类不一致 2019-06-03 17:05:09 +08:00
wanyaoqi
fd0bb33afb fix imported bm server start 2019-06-03 15:26:21 +08:00
Jian Qiu
c28d8d1830 3level priviliges bufixes 20190603 (#1037) 2019-06-03 12:31:13 +08:00
Jian Qiu
7e44f2a02e update vendor (#1035) 2019-06-03 12:23:24 +08:00
ioito
70e15e4895 避免未使用最优storage 2019-06-03 10:06:50 +08:00
Jian Qiu
c515082dd1 Automated cherry pick of #1026: fix: misc 3level priviliges bugfixes (#1027)
* fix: misc 3level priviliges bugfixes

* misc bugfixes

* misc bugfixes
2019-06-02 08:05:28 +08:00
Jian Qiu
155e0d7386 fix: keystone fernet setup bugs and other bugs (#1023) 2019-06-01 17:31:36 +08:00
yunion-ci-robot
4f5c6dea41 Merge pull request #1019 from yunion-ci-robot/cherry-pick-967-to-release/2.10.0
[release/2.10.0] 避免buf copy占用太多内存
2019-06-01 17:28:16 +08:00
yunion-ci-robot
977d9e6e66 Merge pull request #1021 from zhasm/automated-cherry-pick-of-#1018-upstream-release-2.10.0
Automated cherry pick of #1018: 新增 keystone vars 文件以便编译 rpm; wording
2019-06-01 15:48:06 +08:00
Zhang Dongliang
81b23eea46 新增 keystone vars 文件以便编译 rpm; wording 2019-06-01 15:32:17 +08:00
ioito
feac694f35 避免buf copy占用太多内存 2019-06-01 04:02:19 +00:00
yunion-ci-robot
6cbc1896a5 Merge pull request #1013 from swordqiu/automated-cherry-pick-of-#908-upstream-release-2.10.0
Automated cherry pick of #908: feature: keystone support phase 1
2019-05-31 14:30:19 +08:00
Qiu Jian
288bd3e1c3 fix: client auth needs project domain info 2019-05-31 14:24:34 +08:00
Qiu Jian
bce064dd15 update vendor 2019-05-31 14:24:33 +08:00
Qiu Jian
fe0839992e minor fixes 2019-05-31 14:24:33 +08:00
Qiu Jian
c8b133e272 allow login without specifying user's domain 2019-05-31 14:24:33 +08:00
Qiu Jian
0343e07217 feature: support identity provider and more... 2019-05-31 14:24:33 +08:00
Qiu Jian
afd1f0fe60 misc fixes 2019-05-31 14:21:53 +08:00
Qiu Jian
2e9c5005f1 bugfixes 2019-05-31 14:21:53 +08:00
Qiu Jian
e5343742ab feature: 3-level policies, system/domain/project 2019-05-31 14:21:53 +08:00
Qiu Jian
c0673c6ecb fix: add keystone initialization procedures 2019-05-31 14:21:53 +08:00
Qiu Jian
0cde6fd34a feature: keystone support phase 1 2019-05-31 14:21:52 +08:00
Qiu Jian
d124854e3b resolve merge conflict 2019-05-31 14:21:52 +08:00
Qiu Jian
f6e32772d7 misc fixes 2019-05-31 14:21:52 +08:00
Qiu Jian
f8ee96ff9a bugfixes 2019-05-31 14:21:52 +08:00
Qiu Jian
97010fae73 update vendor 2019-05-31 14:21:52 +08:00
Qiu Jian
c005db28b9 feature: 3-level policies, system/domain/project 2019-05-31 14:21:52 +08:00
Qiu Jian
12d9d63628 fix: add keystone initialization procedures 2019-05-31 14:19:05 +08:00
Qiu Jian
20a6927e63 feature: keystone support phase 1 2019-05-31 14:19:05 +08:00
yunion-ci-robot
24ce4395e1 Merge pull request #984 from swordqiu/automated-cherry-pick-of-#983-upstream-release-2.10.0
Automated cherry pick of #983: fix: esxi vm may fail on start or delete in batch
2019-05-31 13:51:22 +08:00
yunion-ci-robot
585874edee Merge pull request #1012 from yunion-ci-robot/cherry-pick-1009-to-release/2.10.0
[release/2.10.0] fix on guest migrate fail
2019-05-31 13:18:20 +08:00
wanyaoqi
3584748d5b fix on guest migrate fail 2019-05-31 05:16:22 +00:00
yunion-ci-robot
a7188477b7 Merge pull request #1008 from yunion-ci-robot/cherry-pick-1004-to-release/2.10.0
[release/2.10.0] lb: 添加PROXY协议支持
2019-05-31 12:34:19 +08:00
Yousong Zhou
c0c51730d7 lb: 添加PROXY协议支持
默认关闭(off),支持v1, v2, v2-ssl, v2-ssl-cn

可分别在listener, backend上控制

 - 若listener.send_proxy不为off,以listener.backend_proxy为准
 - 若listener.send_proxy为off,以backend.send_proxy为准
2019-05-31 04:31:38 +00:00
yunion-ci-robot
5a5de52d08 Merge pull request #1006 from ioito/automated-cherry-pick-of-#1005-upstream-release-2.10.0
Automated cherry pick of #1005: 避免出现err==nil&&n==0的情况
2019-05-31 12:22:21 +08:00
ioito
9c44e831e8 避免出现err==nil&&n==0的情况 2019-05-31 12:13:59 +08:00
yunion-ci-robot
5302a9f227 Merge pull request #1002 from yunion-ci-robot/cherry-pick-991-to-release/2.10.0
[release/2.10.0] scheduler: remove gorm code
2019-05-30 23:46:21 +08:00
yunion-ci-robot
da87e4d3ef Merge pull request #1001 from yunion-ci-robot/cherry-pick-992-to-release/2.10.0
[release/2.10.0] 避免同步云路由器镜像
2019-05-30 22:45:19 +08:00
Zexi
4619115df9 scheduler: remove gorm code 2019-05-30 14:43:58 +00:00
ioito
eff3babfde 避免同步云路由器镜像 2019-05-30 14:05:53 +00:00
yunion-ci-robot
42bbe3e3ed Merge pull request #1000 from yunion-ci-robot/cherry-pick-977-to-release/2.10.0
[release/2.10.0] Bugfix/wyq/fix glance notify
2019-05-30 19:13:19 +08:00
wanyaoqi
e19bca42b1 glance detect disable lvm 2019-05-30 11:11:30 +00:00
wanyaoqi
0bed2eb65f - fix image status on upload failed - fix init nbd 2019-05-30 11:11:30 +00:00
wanyaoqi
711bf829cd fix glance notify 2019-05-30 11:11:30 +00:00
yunion-ci-robot
3f3f68cba0 Merge pull request #990 from yunion-ci-robot/cherry-pick-898-to-release/2.10.0
[release/2.10.0] 简化provider-factory代码
2019-05-30 19:10:21 +08:00
yunion-ci-robot
f6ef955c3a Merge pull request #999 from yunion-ci-robot/cherry-pick-968-to-release/2.10.0
[release/2.10.0] 避免oUserData为nil时野指针访问
2019-05-30 17:49:22 +08:00
ioito
886d2ca7d1 避免oUserData为nil时野指针访问 2019-05-30 09:37:57 +00:00
yunion-ci-robot
6daf825ecf Merge pull request #994 from yunion-ci-robot/cherry-pick-993-to-release/2.10.0
[release/2.10.0] fix guest display metadata
2019-05-30 16:56:25 +08:00
wanyaoqi
0fe63fa7ef fix guest display metadata 2019-05-30 08:48:31 +00:00
ioito
0d9f32152f 简化代码 2019-05-30 08:13:37 +00:00
yunion-ci-robot
2db94a99e5 Merge pull request #987 from yunion-ci-robot/cherry-pick-955-to-release/2.10.0
[release/2.10.0] 避免webconsole频繁连接server,导致IP被封禁
2019-05-30 15:10:18 +08:00
ioito
1b336fcff7 避免频繁连接server 2019-05-30 07:03:43 +00:00
Qiu Jian
a92b5ac9f8 fix: esxi vm may fail on start or delete in batch 2019-05-30 14:43:10 +08:00
yunion-ci-robot
2a95df157a Merge pull request #982 from Zexi/automated-cherry-pick-of-#978-upstream-release-2.10.0
Automated cherry pick of #978: scheduler: add pending usage process
2019-05-29 20:40:20 +08:00
yunion-ci-robot
5a7dd2dfa9 Merge pull request #980 from yunion-ci-robot/cherry-pick-976-to-release/2.10.0
[release/2.10.0] docs: 添加认证描述
2019-05-29 19:59:18 +08:00
Zexi
b9d8a95dbc scheduler: add pending usage process 2019-05-29 19:58:59 +08:00
Yousong Zhou
19af85ad6d docs: 添加swagger标准文档链接 2019-05-29 11:56:32 +00:00
Yousong Zhou
540b68c4f7 docs: 添加认证描述 2019-05-29 11:56:32 +00:00
yunion-ci-robot
10280ab7fb Merge pull request #975 from yunion-ci-robot/cherry-pick-974-to-release/2.10.0
[release/2.10.0] docs: 添加swagger.yaml
2019-05-29 17:09:21 +08:00
Yousong Zhou
5592297f51 docs: 添加swagger.yaml 2019-05-29 09:07:30 +00:00
yunion-ci-robot
811eb35fee Merge pull request #970 from yunion-ci-robot/cherry-pick-969-to-release/2.10.0
[release/2.10.0] yunionconf parameter serivce bugfix
2019-05-29 16:41:18 +08:00
yunion-ci-robot
267b5fcfa4 Merge pull request #972 from yunion-ci-robot/cherry-pick-971-to-release/2.10.0
[release/2.10.0] scheduler: fix nets result not select
2019-05-29 16:25:20 +08:00
Zexi
0a974548c0 scheduler: fix nets result not select 2019-05-29 08:19:29 +00:00
TangBin
5afc497fdd yunionconf parameter serivce bugfix 2019-05-29 07:50:40 +00:00
yunion-ci-robot
608cf8bab1 Merge pull request #964 from yunion-ci-robot/cherry-pick-956-to-release/2.10.0
[release/2.10.0] lb: 支持直接指定ip作为后端
2019-05-29 11:44:20 +08:00
Yousong Zhou
07b1107449 mcclient: options: use --loadbalancer for consistency
Fixes 2df78f
2019-05-29 01:51:32 +00:00
Yousong Zhou
a2386a270c loadbalancerbackends: 支持直接指定IP地址 2019-05-29 01:51:32 +00:00
yunion-ci-robot
8deed2a9a1 Merge pull request #962 from Zexi/automated-cherry-pick-of-#961-upstream-release-2.10.0
Automated cherry pick of #961: fix: schedule fatal error concurrent map writes
2019-05-29 09:50:18 +08:00
Zexi
f05c98692a fix: schedule fatal error concurrent map writes 2019-05-29 09:46:16 +08:00
yunion-ci-robot
3fb001f1ee Merge pull request #952 from ioito/automated-cherry-pick-of-#943-upstream-release-2.10.0
Automated cherry pick of #943: 避免转换成shell格式后导致合并失败
2019-05-28 22:03:21 +08:00
yunion-ci-robot
a2fce9b1d9 Merge pull request #958 from yunion-ci-robot/cherry-pick-957-to-release/2.10.0
[release/2.10.0] fix go fmt
2019-05-28 20:20:18 +08:00
ioito
3cf5c9c4f0 fix go fmt 2019-05-28 12:13:34 +00:00
ioito
06130b623d 避免转换成shell格式后导致合并失败 2019-05-28 16:59:49 +08:00
yunion-ci-robot
85f8fd9eec Merge pull request #948 from yunion-ci-robot/cherry-pick-947-to-release/2.10.0
[release/2.10.0] host: support pid file
2019-05-28 16:05:18 +08:00
wanyaoqi
584e2d3c7a support add pid file 2019-05-28 07:51:44 +00:00
yunion-ci-robot
adb5ef59ba Merge pull request #940 from yunion-ci-robot/cherry-pick-933-to-release/2.10.0
[release/2.10.0] routetables: 改正同步
2019-05-28 13:40:19 +08:00
yunion-ci-robot
d4f2fdf1a8 Merge pull request #944 from yunion-ci-robot/cherry-pick-934-to-release/2.10.0
[release/2.10.0] 一些bug修复
2019-05-28 12:10:19 +08:00
wanyaoqi
77b85a0885 bugfix:
- fix import from libvirt
- fix server deploy
- fix guest migrate
- golang host bugfix
2019-05-28 04:00:32 +00:00
Yousong Zhou
610b853062 routetables: default to name rtbl-<vpc.name> 2019-05-27 12:55:28 +00:00
Yousong Zhou
e4d363704e routetables: sync: add vpc-awareness 2019-05-27 12:55:28 +00:00
yunion-ci-robot
f057df16f6 Merge pull request #935 from yunion-ci-robot/cherry-pick-932-to-release/2.10.0
[release/2.10.0] 补充缺失的task stage
2019-05-27 20:55:18 +08:00
ioito
bcf536ca15 补充缺失的task stage 2019-05-27 12:51:36 +00:00
23570 changed files with 894466 additions and 8084222 deletions

39
.circleci/Dockerfile Normal file
View File

@@ -0,0 +1,39 @@
FROM centos:7
MAINTAINER Yousong Zhou <zhouyousong@yunion.cn>
RUN true \
&& yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
&& yum install -y git wget \
&& yum groupinstall -y "Development Tools" \
&& : ceph for cmd/host \
&& rpm --import 'https://download.ceph.com/keys/release.asc' \
&& yum install -y https://download.ceph.com/rpm-luminous/el7/noarch/ceph-release-1-1.el7.noarch.rpm \
&& yum install -y libcephfs-devel librbd-devel librados-devel \
&& yum clean all
WORKDIR /opt
RUN true \
&& wget https://dl.google.com/go/go1.13.3.linux-amd64.tar.gz \
&& tar xzf go1.13.3.linux-amd64.tar.gz \
&& rm -vf go1.13.3.linux-amd64.tar.gz \
&& true
ENV GOROOT="/opt/go"
ENV PATH="/opt/go/bin:${PATH}"
RUN useradd -c "OneCloud Builder" --create-home --home-dir /home/build --shell /bin/bash build
USER build
ENV HOME /home/build
WORKDIR /home/build
USER build
ENV GOPATH="/home/build/go"
ENV PATH="${GOPATH}/bin:${PATH}"
RUN true \
&& mkdir -p "$GOPATH" \
&& d="$GOPATH/src/golang.org/x/tools" \
&& mkdir -p "$d" \
&& git clone --branch yun --depth 8 https://github.com/yousong/tools "$d" \
&& cd "$d" \
&& go install ./cmd/goimports \
&& true

View File

@@ -3,11 +3,22 @@
# Check https://circleci.com/docs/2.0/language-go/ for more details
version: 2
jobs:
test:
check:
docker:
- image: yunionio/onecloud-ci:v1.0.3
environment:
ONECLOUD_CI_BUILD: "1"
working_directory: /home/build/go/src/yunion.io/x/onecloud
steps:
- checkout
- run:
command: |
make check
build:
requires:
- check
docker:
- image: yunion/alpine-build:3.22.0-go-1.24.6-1
- image: yunionio/onecloud-ci:v1.0.2
environment:
ONECLOUD_CI_BUILD: "1"
@@ -15,22 +26,58 @@ jobs:
#### expecting it in the form of
#### /go/src/github.com/circleci/go-tool
#### /go/src/bitbucket.org/circleci/go-tool
working_directory: /root/go/src/yunion.io/x/onecloud
resource_class: large
parallelism: 1
working_directory: /home/build/go/src/yunion.io/x/onecloud
parallelism: 4
steps:
- checkout
- restore_cache:
key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
paths:
- /home/build/.cache/go-build
- run:
command: |
make -j3 check
make test
targets="$(circleci tests glob "cmd/*" | grep -v cmd/host-image | circleci tests split)"
echo $targets | tr ' ' '\n'
make $targets
ls -lh _output/bin/
- save_cache:
key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
paths:
- /home/build/.cache/go-build
- store_artifacts:
path: _output/
test:
requires:
- check
docker:
- image: yunionio/onecloud-ci:v1.0.2
environment:
GO111MODULE: "on"
working_directory: /home/build/go/src/yunion.io/x/onecloud
steps:
- checkout
- restore_cache:
key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
paths:
- /home/build/.cache/go-build
- run:
name: unit_test
command: |
./scripts/coverage.sh --codecov
- save_cache:
key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
paths:
- /home/build/.cache/go-build
workflows:
version: 2
build_and_test:
jobs:
- test
- check
- build:
requires:
- check
- test:
requires:
- check

View File

@@ -1,7 +0,0 @@
_output/alpine-build/_cache
pkg
vendor
cmd
locales
docs
scripts

View File

@@ -2,131 +2,49 @@
kind: pipeline
name: build
clone:
depth: 1
workspace:
base: /home/build/go
base: /go
path: src/yunion.io/x/onecloud
steps:
- name: build
image: yunion/onecloud-ci:latest
image: d3lx/golang:yunion
commands:
- CGO_ENABLED=0 make -j 4 cmd/apigateway cmd/baremetal-agent cmd/climc cmd/keystone
- CGO_ENABLED=0 make -j 4 cmd/logger cmd/region cmd/scheduler cmd/webconsole
- CGO_ENABLED=0 make -j 4 cmd/yunionconf cmd/glance cmd/torrent
- make
when:
event:
- pull_request
- tag
- name: image-baremetal-agent
trigger:
event:
- pull_request
- tag
---
kind: pipeline
name: release
steps:
- name: release-img
image: plugins/docker
settings:
repo: registry.cn-beijing.aliyuncs.com/yunionio/baremetal-agent
repo: registry.cn-beijing.aliyuncs.com/yunionio/onecloud
registry: registry.cn-beijing.aliyuncs.com
dockerfile: build/docker/Dockerfile.baremetal-agent
tags: "${DRONE_TAG}"
username:
from_secret: docker_username
password:
from_secret: docker_password
- name: image-climc
image: plugins/docker
settings:
repo: registry.cn-beijing.aliyuncs.com/yunionio/climc
registry: registry.cn-beijing.aliyuncs.com
dockerfile: build/docker/Dockerfile.climc
tags: "${DRONE_TAG}"
username:
from_secret: docker_username
password:
from_secret: docker_password
- name: image-keystone
image: plugins/docker
settings:
repo: registry.cn-beijing.aliyuncs.com/yunionio/keystone
registry: registry.cn-beijing.aliyuncs.com
dockerfile: build/docker/Dockerfile.keystone
tags: "${DRONE_TAG}"
username:
from_secret: docker_username
password:
from_secret: docker_password
- name: image-logger
image: plugins/docker
settings:
repo: registry.cn-beijing.aliyuncs.com/yunionio/logger
registry: registry.cn-beijing.aliyuncs.com
dockerfile: build/docker/Dockerfile.logger
tags: "${DRONE_TAG}"
username:
from_secret: docker_username
password:
from_secret: docker_password
- name: image-region
image: plugins/docker
settings:
repo: registry.cn-beijing.aliyuncs.com/yunionio/region
registry: registry.cn-beijing.aliyuncs.com
dockerfile: build/docker/Dockerfile.region
tags: "${DRONE_TAG}"
username:
from_secret: docker_username
password:
from_secret: docker_password
- name: image-scheduler
image: plugins/docker
settings:
repo: registry.cn-beijing.aliyuncs.com/yunionio/scheduler
registry: registry.cn-beijing.aliyuncs.com
dockerfile: build/docker/Dockerfile.scheduler
tags: "${DRONE_TAG}"
username:
from_secret: docker_username
password:
from_secret: docker_password
- name: image-yunionconf
image: plugins/docker
settings:
repo: registry.cn-beijing.aliyuncs.com/yunionio/yunionconf
registry: registry.cn-beijing.aliyuncs.com
dockerfile: build/docker/Dockerfile.yunionconf
tags: "${DRONE_TAG}"
username:
from_secret: docker_username
password:
from_secret: docker_password
- name: image-apigateway
image: plugins/docker
settings:
repo: registry.cn-beijing.aliyuncs.com/yunionio/apigateway
registry: registry.cn-beijing.aliyuncs.com
dockerfile: build/docker/Dockerfile.apigateway
tags: "${DRONE_TAG}"
username:
from_secret: docker_username
password:
from_secret: docker_password
- name: image-glance
image: plugins/docker
settings:
repo: registry.cn-beijing.aliyuncs.com/yunionio/glance
registry: registry.cn-beijing.aliyuncs.com
dockerfile: build/docker/Dockerfile.glance
tags: "${DRONE_TAG}"
tags: "{DRONE_TAG}"
username:
from_secret: docker_username
password:
from_secret: docker_password
when:
event:
- tag
trigger:
event:
- tag
status:
- success
depends_on:
- build

View File

@@ -1,3 +0,0 @@
[*.sh]
indent_style = space
indent_size = 4

View File

@@ -1,20 +1,21 @@
---
name: Bug report
about: 报告代码缺陷/Create a bug report to help us improve
title: '[BUG]'
about: Create a report to help us improve
title: ''
labels: bug
assignees: ''
---
**问题描述/What happened**:
**What happened**:
**环境/Environment**:
**What you expected to happen**:
- OS (e.g. `cat /etc/os-release`):
**How to reproduce it**:
**Anything else we need to know?**:
**Environment**:
- OS (e.g: `cat /etc/os-release`):
- Kernel (e.g. `uname -a`):
- Host: (e.g. `dmidecode | egrep -i 'manufacturer|product' |sort -u`)
- Service Version (e.g. `kubectl exec -n onecloud $(kubectl get pods -n onecloud | grep climc | awk '{print $1}') -- climc version-list`):
<!--
- Version (e.g. `climc version-list`):
-->
- Others:

View File

@@ -1,12 +0,0 @@
---
name: 文档问题/Document Request
about: 文档相关缺陷改进/Document request to this project
title: '[文档/Docs]'
labels:
- area/docs
- enhancement
assignees: ''
---
**What part of the document needs to be added**:

View File

@@ -1,10 +1,14 @@
---
name: 新特性/Feature Request
about: 建议新功能特性/Suggest an idea for this project
title: '[Feature]'
name: Feature request
about: Suggest an idea for this project
title: ''
labels: feature
assignees: ''
---
<!-- Please only use this template for submitting feature requests -->
**What would you like to be added**:
**Why is this needed**:

View File

@@ -1,7 +1,7 @@
---
name: 求助/Support Request
about: 求助使用中遇到的问题/Support request relating to this project
title: '[求助/Help]'
name: Support Request
about: Support request or question relating to this project
title: ''
labels: question
assignees: ''

View File

@@ -1,19 +1,9 @@
**What this PR does / why we need it**:
**这个 PR 实现什么功能/修复什么问题**:
**是否需要 backport 到之前的 release 分支**:
<!--
- [ ] Smoke testing completed
- [ ] Unit test written
-->
**Does this PR need to be backport to the previous release branch?**:
<!--
If no, just write "NONE".
If don't know, write "UNKNOWN", and let the reviewer decide.
If yes, write the release branches name in the below format and submit the related cherry-pick PR:
- release/3.11
Take a look at "https://www.cloudpods.org/en/docs/contribute/contrib/" to learn how to submit a cherry-pick PR.
如果不需要,填写 "NONE".
如果需要,就以下面 item 的格式写 release 分支名,并提交对应的 cherry-pick PR:
- release/2.8.0
- release/2.6.0
-->

View File

@@ -1,38 +0,0 @@
name: Building and test for PR
on:
pull_request:
types: [opened, synchronize, reopened]
jobs:
build_and_test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Install check tools
shell: bash
run: |
set -o xtrace
git clone --branch master --depth 4 https://github.com/yunionio/tools && cd tools
go build ./cmd/goimports && sudo cp goimports /usr/bin/ && cd .. && rm -rf tools
git clone --depth 4 https://github.com/yousong/y18n && cd y18n
go build . && sudo cp y18n /usr/bin && cd .. && rm -rf y18n
- name: Test and build
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
make -j3 check
make test
targets="$(find cmd -mindepth 1 -maxdepth 1 -type d | grep -v cmd/host-image | grep -v torrent)"
echo $targets | tr ' ' '\n'
make $targets
ls -lh _output/bin

View File

@@ -1,52 +0,0 @@
name: Apigateway Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudcommon/db/**.go'
- 'pkg/apigateway/**.go'
- 'pkg/apis/apigateway/**.go'
- 'pkg/mcclient/modules/**.go'
jobs:
build_apigateway:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image apigateway

View File

@@ -1,50 +0,0 @@
name: Climc Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'cmd/climc/**.go'
- 'pkg/mcclient/**.go'
- 'vendor/yunion.io/x/structarg/**.go'
jobs:
build_climc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image climc

View File

@@ -1,51 +0,0 @@
name: Cloudmon Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudmon/**.go'
- 'vendor/yunion.io/x/cloudmux/pkg/multicloud/loader/**.go'
jobs:
build_webconsole:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image cloudmon

View File

@@ -1,49 +0,0 @@
name: Esxi Agent Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/esxi/**.go'
jobs:
build_webconsole:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image esxi-agent

View File

@@ -1,53 +0,0 @@
name: Glance Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudcommon/db/**.go'
- 'pkg/image/**.go'
- 'pkg/apis/image/**.go'
- 'vendor/yunion.io/x/sqlchemy/**.go'
- 'vendor/yunion.io/x/jsonutils/**.go'
jobs:
build_glance:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image glance

View File

@@ -1,49 +0,0 @@
name: Host Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/hostman/**.go'
- 'pkg/apis/host/**.go'
jobs:
build_host:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image host

View File

@@ -1,53 +0,0 @@
name: Keystone Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudcommon/db/**.go'
- 'pkg/keystone/**.go'
- 'pkg/apis/identity/**.go'
- 'vendor/yunion.io/x/sqlchemy/**.go'
- 'vendor/yunion.io/x/jsonutils/**.go'
jobs:
build_keystone:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image keystone

View File

@@ -1,53 +0,0 @@
name: Logger Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudcommon/db/**.go'
- 'pkg/logger/**.go'
- 'pkg/apis/logger/**.go'
- 'vendor/yunion.io/x/sqlchemy/**.go'
- 'vendor/yunion.io/x/jsonutils/**.go'
jobs:
build_webconsole:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image logger

View File

@@ -1,53 +0,0 @@
name: Notify Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudcommon/db/**.go'
- 'pkg/notify/**.go'
- 'pkg/apis/notify/**.go'
- 'vendor/yunion.io/x/sqlchemy/**.go'
- 'vendor/yunion.io/x/jsonutils/**.go'
jobs:
build_notify:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image notify

View File

@@ -1,54 +0,0 @@
name: Region Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudcommon/db/**.go'
- 'pkg/compute/**.go'
- 'pkg/apis/compute/**.go'
- 'vendor/yunion.io/x/cloudmux/**.go'
- 'vendor/yunion.io/x/sqlchemy/**.go'
- 'vendor/yunion.io/x/jsonutils/**.go'
jobs:
build_region:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image region

View File

@@ -1,50 +0,0 @@
name: Scheduler Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/scheduler/**.go'
- 'pkg/apis/scheduler/**.go'
jobs:
build_webconsole:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image scheduler

View File

@@ -1,53 +0,0 @@
name: Webconsole Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudcommon/db/**.go'
- 'pkg/webconsole/**.go'
- 'pkg/apis/webconsole/**.go'
- 'vendor/yunion.io/x/sqlchemy/**.go'
- 'vendor/yunion.io/x/jsonutils/**.go'
jobs:
build_webconsole:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image webconsole

View File

@@ -1,45 +0,0 @@
name: Issue Check Inactive
on:
schedule:
- cron: "0 0 * * *"
permissions:
issues: write
jobs:
issue-check-inactive:
runs-on: ubuntu-latest
steps:
- name: Label inactive issues as stale
env:
GH_TOKEN: ${{ github.token }}
INACTIVE_DAY: "30"
INACTIVE_LABEL: "stale"
EXCLUDE_LABEL: "announcement"
run: |
set -euo pipefail
cutoff="$(date -u -d "${INACTIVE_DAY} days ago" +%Y-%m-%dT%H:%M:%SZ)"
gh issue list \
--repo "${{ github.repository }}" \
--state open \
--limit 1000 \
--json number,labels,updatedAt \
| jq -c \
--arg cutoff "$cutoff" \
--arg inactive "$INACTIVE_LABEL" \
--arg exclude "$EXCLUDE_LABEL" \
'
.[]
| select(.updatedAt < $cutoff)
| select([.labels[].name] | index($exclude) | not)
| select([.labels[].name] | index($inactive) | not)
' \
| while IFS= read -r issue; do
number="$(echo "$issue" | jq -r .number)"
echo "Marking issue #${number} as ${INACTIVE_LABEL}"
gh issue edit "$number" \
--repo "${{ github.repository }}" \
--add-label "$INACTIVE_LABEL"
done

View File

@@ -1,44 +0,0 @@
name: Issue Close Require
on:
schedule:
- cron: "0 1 * * *"
permissions:
issues: write
jobs:
issue-close-require:
runs-on: ubuntu-latest
steps:
- name: Close inactive issues awaiting user feedback
env:
GH_TOKEN: ${{ github.token }}
INACTIVE_DAY: "7"
run: |
set -euo pipefail
cutoff="$(date -u -d "${INACTIVE_DAY} days ago" +%Y-%m-%dT%H:%M:%SZ)"
body="$(cat <<'EOF'
If you do not provide feedback for more than 37 days, we will close the issue and you can either reopen it or submit a new issue.
您超过 37 天未反馈信息,我们将关闭该 issue如有需求您可以重新打开或者提交新的 issue。
EOF
)"
# Trim leading indentation from heredoc lines for a cleaner comment.
body="$(printf '%s\n' "$body" | sed 's/^[[:space:]]*//')"
gh issue list \
--repo "${{ github.repository }}" \
--state open \
--label "stale" \
--label "state/awaiting user feedback" \
--limit 1000 \
--json number,updatedAt \
| jq -c --arg cutoff "$cutoff" '.[] | select(.updatedAt < $cutoff)' \
| while IFS= read -r issue; do
number="$(echo "$issue" | jq -r .number)"
echo "Closing issue #${number}"
gh issue close "$number" \
--repo "${{ github.repository }}" \
--comment "$body"
done

View File

@@ -1,22 +0,0 @@
name: Issue Close Check
on:
issues:
types: [closed]
permissions:
issues: write
jobs:
issue-closed-remove-labels:
runs-on: ubuntu-latest
if: "!contains(github.event.issue.labels.*.name, 'stale')"
steps:
- name: Remove state labels when issue that hasn't stale label is closed
env:
GH_TOKEN: ${{ github.token }}
run: |
gh issue edit "${{ github.event.issue.number }}" \
--repo "${{ github.repository }}" \
--remove-label "state/awaiting processing" \
--remove-label "state/awaiting user feedback" || true

View File

@@ -1,51 +0,0 @@
on:
issue_comment:
types: [created]
name: Add issues workflow labels
permissions:
issues: write
jobs:
add-label-if-is-author:
runs-on: ubuntu-latest
if: (github.event.issue.user.id == github.event.comment.user.id) && !github.event.issue.pull_request && (github.event.issue.state == 'open')
steps:
- name: Add require handle label
env:
GH_TOKEN: ${{ github.token }}
run: |
gh issue edit "${{ github.event.issue.number }}" \
--repo "${{ github.repository }}" \
--add-label "state/awaiting processing"
- name: Remove require reply label
env:
GH_TOKEN: ${{ github.token }}
run: |
gh issue edit "${{ github.event.issue.number }}" \
--repo "${{ github.repository }}" \
--remove-label "state/awaiting user feedback" \
--remove-label "stale" || true
add-label-if-not-author:
runs-on: ubuntu-latest
if: (github.event.issue.user.id != github.event.comment.user.id) && !github.event.issue.pull_request && (github.event.issue.state == 'open') && (!contains(github.event.comment.body, '/keep-state'))
steps:
- name: Add require reply label
env:
GH_TOKEN: ${{ github.token }}
run: |
gh issue edit "${{ github.event.issue.number }}" \
--repo "${{ github.repository }}" \
--add-label "state/awaiting user feedback"
- name: Remove require handle label
env:
GH_TOKEN: ${{ github.token }}
run: |
gh issue edit "${{ github.event.issue.number }}" \
--repo "${{ github.repository }}" \
--remove-label "state/awaiting processing" \
--remove-label "stale" || true

View File

@@ -1,17 +0,0 @@
on:
issue_comment:
types: [created]
jobs:
notify-author-comment:
runs-on: ubuntu-latest
if: (github.event.issue.user.id == github.event.comment.user.id) && !github.event.issue.pull_request
# find context from: https://docs.github.com/en/webhooks/webhook-events-and-payloads#issue_comment
steps:
- name: feishu notify
uses: zexi/action-issues-notify@v1
with:
url: ${{ secrets.FEISHU_BOT_WEBHOOK_URL }}
issue_title: "${{ github.event.comment.user.login }} 回复了 issue: ${{ github.event.issue.title }}"
issue_body: "${{ tojson(github.event.comment.body) }}"
issue_link_url: "${{github.event.comment.html_url}}"

View File

@@ -1,41 +0,0 @@
name: Issue Open Check
on:
issues:
types: [opened, reopened]
permissions:
issues: write
jobs:
issue-open-add-labels:
runs-on: ubuntu-latest
if: ${{ !github.event.issue.pull_request }}
steps:
- name: Add labels
env:
GH_TOKEN: ${{ github.token }}
run: |
gh issue edit "${{ github.event.issue.number }}" \
--repo "${{ github.repository }}" \
--add-label "state/awaiting processing"
- name: Remove require reply label
env:
GH_TOKEN: ${{ github.token }}
run: |
gh issue edit "${{ github.event.issue.number }}" \
--repo "${{ github.repository }}" \
--remove-label "state/awaiting user feedback" \
--remove-label "stale" || true
notify-author-comment:
runs-on: ubuntu-latest
steps:
- name: feishu notify
uses: zexi/action-issues-notify@v1
with:
url: ${{ secrets.FEISHU_BOT_WEBHOOK_URL }}
issue_title: "${{ github.event.issue.user.login }} 提交了 issue: ${{ github.event.issue.title }}"
issue_body: "${{ tojson(github.event.issue.body) }}"
issue_link_url: "${{github.event.issue.html_url}}"

10
.gitignore vendored
View File

@@ -30,16 +30,6 @@ _output
/relay
/structargtest
.idea
.vscode
intellij.yaml
GPATH
GRTAGS
GTAGS
pkg/generated
*.orig
# gotext extracted
out.gotext.json
pkg/notify/sender/email_test.go

View File

@@ -15,7 +15,7 @@ addons:
language: go
go:
- 1.14.x
- 1.12.x
go_import_path: yunion.io/x/onecloud
cache:
directories:

View File

@@ -1,128 +0,0 @@
# Contributor Covenant Code of Conduct
## Our Pledge
We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.
We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.
## Our Standards
Examples of behavior that contributes to a positive environment for our
community include:
* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community
Examples of unacceptable behavior include:
* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
## Enforcement Responsibilities
Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.
Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.
## Scope
This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
abuse@cloudpods.org.
All complaints will be reviewed and investigated promptly and fairly.
All community leaders are obligated to respect the privacy and security of the
reporter of any incident.
## Enforcement Guidelines
Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:
### 1. Correction
**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.
**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.
### 2. Warning
**Community Impact**: A violation through a single incident or series
of actions.
**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.
### 3. Temporary Ban
**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.
**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.
### 4. Permanent Ban
**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.
**Consequence**: A permanent ban from any sort of public interaction within
the community.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).
[homepage]: https://www.contributor-covenant.org
For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.

View File

@@ -1,51 +0,0 @@
# Contribution Guide
[English](CONTRIBUTING.md) | [中文](CONTRIBUTING_zh.md)
You can help to make Cloudpods better! There are many things you can do:
## Help others know Cloudpods
First of all, the easiest way to contribute to Cloudpods is to let more people know Cloudpods. To share your experience of Cloudpods. Hopefully Cloudpods may help resolve the issues in their daily jobs.
## Report Bugs
Cloudpods is an infrastructure management tool. Even though it has been thourougly tested and codes have been peer reviwed before merge, due to its complexity, you may still encounter bugs when using Cloudpods. This is frustrating. However, please do not hesitate to submit a issue at Github. The issue may help developers to improve the codes and make Cloudpods more and more robust. Meanwhile, the answer to the issues may also help others who have the similar bugs.
## Answer issues
You may answer issues at Github and help those who encounter issues when using Cloudpods. Sometimes, the issues are not due to bugs in codes but simplely because of misconfigurations, environment or misunderstandings.
## Contribute codes
You are welcome to contribute codes to Cloudpods. Please refers to [CONTRIBUTING](https://www.cloudpods.org/en/docs/development/contrib/) for more details on how to contribute codes to Cloudpods.
### Fix Issues
You may help solve bugs by submiting patches.
### New Features
You may help improve the codes of Cloudpods, including:
* Develop new [features for Cloudpods](https://github.com/yunionio/cloudpods/issues?q=is%3Aopen+is%3Aissue+label%3Afeature).
* Recode some part of Cloudpods so as to make the code easier to be understood, or less error-prone, or more efficient.
## Documentation
You may help improve documentations of Cloudpds by directly make pull request to documentations. Once the Pull Request is accepted and merged, the documentations will be updated immediately.
## Translation
You may help translate the UI texts or documents of Cloudpds to other languages. Currently, we support Simplified Chinese and English.
## Write articles
You are also welcome to write articles about Cloudpods and sharing your experience with others. The content of the articles may include the following but not be limited to:
* Your user experiences with Cloudpods
* Your opinion about the direction and area of Cloudpods
* Comparison with other cloud platforms
* Benchmarks

View File

@@ -1,48 +0,0 @@
# 贡献指南
[English](CONTRIBUTING.md) | [中文](CONTRIBUTING_zh.md)
如果您对Cloudpods感兴趣并且愿意为Cloudpods贡献可以通过以下任意方式贡献您的力量使得Cloudpods变得更完善。
## 让别人知道Cloudpods
最简单的方式就是让更多的人知道Cloudpods向他们分享您对Cloudpds的看法和使用经验向他们推荐Cloudpods。很有可能在您的推荐下他们开始使用Cloudpods并解决了他们在工作中遇到的基础设施管理问题。
## 报告BUG
Cloudpods是一款开源的基础设施管理工具软件运行场景复杂。尽管在开发阶段开发者很有可能已经进行了详尽的测试但难免在实际运行中还会遇到各种意想不到的bug。遇到这种情况请不要犹豫在Github上提交一个issue。这能帮助开发者更好地改进代码逻辑使得Cloudpods越来越鲁棒。同时issue的解答记录也能帮助到遇到类似问题的其他人。
## 回答问题
有时候人们在使用Cloudpods中遇到的问题并不是因为Cloudpods软件缺陷造成的而是因为配置错误环境因素或者误会导致的。这样的问题也许只需要简单地一两句就能解答不需要代码的修改。您可以在Github回答issue或者社区群中回答提问帮助那些在使用Cloudpods中遇到问题的人。
## 贡献代码
我们非常欢迎和感谢开发者向项目提交代码PR流程细节请查看 [CONTRIBUTING](https://www.cloudpods.org/docs/development/contrib/).
### 修复BUG
您可以通过提交代码补丁来修复Cloudpods存在的BUG。
### 开发新的功能特性
不仅仅是修复BUG您也可以通过提交代码以改进Cloudpods包括但不限于
* 开发新的功能特性,您可以在[feature issues](https://github.com/yunionio/cloudpods/issues?q=is%3Aopen+is%3Aissue+label%3Afeature)查找需要的功能。
* 重构代码,使得代码更加简洁易读,更加低健壮,或者执行起来更加高效。
## 文档
您也可以通过给文档提交PR来改进Cloudpods的文档。一旦您的PR被接收并合并Cloudpods的在线文档就能及时地自动更新。
## 翻译
您也可以帮助翻译Cloudpods要么翻译UI界面的i18n配置文件要么翻译文档使得Cloudpods支持更多的语言。目前Cloudpods支持简体中文和英文。
## 写文章
另外欢迎您写关于Cloudpods的文章通过文字分享您使用Cloudpods的经验和技巧。文章可以包括但不限于如下内容
* 使用Cloudpods的体验
* Cloudpods技术领域的观点
* 和其他竞品的比较
* 性能评测

20
Dockerfile Normal file
View File

@@ -0,0 +1,20 @@
FROM alpine:3.8
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
ENV TZ Asia/Shanghai
# Fix binary file not found, see:
# https://stackoverflow.com/questions/34729748/installed-go-binary-not-found-in-path-on-alpine-linux-docker
RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
RUN mkdir -p /opt/yunion/bin
ADD ./_output/bin/climc /opt/yunion/bin/climc
ADD ./_output/bin/cloudir /opt/yunion/bin/cloudir
ADD ./_output/bin/glance /opt/yunion/bin/glance
ADD ./_output/bin/region /opt/yunion/bin/region
ADD ./_output/bin/region-dns /opt/yunion/bin/region-dns
ADD ./_output/bin/scheduler /opt/yunion/bin/scheduler
ADD ./_output/bin/webconsole /opt/yunion/bin/webconsole
ADD ./_output/bin/yunionconf /opt/yunion/bin/yunionconf

View File

@@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Copyright [2018] [Yunion Technology]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

211
Makefile
View File

@@ -6,12 +6,11 @@ ROOT_DIR := $(CURDIR)
BUILD_DIR := $(ROOT_DIR)/_output
BIN_DIR := $(BUILD_DIR)/bin
BUILD_SCRIPT := $(ROOT_DIR)/build/build.sh
DEB_BUILD_SCRIPT := $(ROOT_DIR)/build/build_deb.sh
ifeq ($(ONECLOUD_CI_BUILD),)
GIT_COMMIT := $(shell git rev-parse --short HEAD)
GIT_BRANCH := $(shell git branch -r --contains | head -1 | sed -E -e "s%(HEAD ->|origin|upstream)/?%%g" | xargs)
GIT_VERSION := $(shell git describe --always --tags --abbrev=14 $(GIT_COMMIT)^{commit})
GIT_BRANCH := $(shell git name-rev --name-only HEAD)
GIT_VERSION := $(shell git describe --tags --abbrev=14 $(GIT_COMMIT)^{commit})
GIT_TREE_STATE := $(shell s=`git status --porcelain 2>/dev/null`; if [ -z "$$s" ]; then echo "clean"; else echo "dirty"; fi)
BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
else
@@ -33,11 +32,8 @@ LDFLAGS := "-w \
#####################################################
ifneq ($(DLV),)
GO_BUILD_FLAGS += -gcflags "all=-N -l"
LDFLAGS = ""
endif
GO_BUILD_FLAGS+=-mod vendor -ldflags $(LDFLAGS)
GO_BUILD_FLAGS:=-mod vendor -ldflags $(LDFLAGS)
GO_BUILD := go build $(GO_BUILD_FLAGS)
GO_INSTALL := go install -ldflags $(LDFLAGS)
GO_TEST := go test
@@ -47,20 +43,17 @@ PKGS := go list ./...
CGO_CFLAGS_ENV = $(shell go env CGO_CFLAGS)
CGO_LDFLAGS_ENV = $(shell go env CGO_LDFLAGS)
export GOOS ?= linux
ifdef LIBQEMUIO_PATH
X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread -L ${LIBQEMUIO_PATH}/src
endif
export GO111MODULE:=on
export CGO_CFLAGS = ${X_CGO_CFLAGS}
export CGO_LDFLAGS = ${X_CGO_LDFLAGS}
UNAME := $(shell uname)
ifeq ($(UNAME), Linux)
XARGS_FLAGS = --no-run-if-empty
endif
cmdTargets:=$(wildcard cmd/*)
cmdTargets:=$(filter-out cmd/host-image,$(wildcard cmd/*))
rpmTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),rpm/$(b)))
debTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),deb/$(b)))
all: build
@@ -73,26 +66,20 @@ install: prepare_dir
gencopyright:
@bash scripts/gencopyright.sh pkg cmd
@sh scripts/gencopyright.sh pkg cmd
test:
@go test $(GO_BUILD_FLAGS) $(shell go list ./... | egrep -v 'host-image|hostimage|torrent')
@go test $(GO_BUILD_FLAGS) $(shell go list ./... | egrep -v 'host-image|hostimage')
vet:
go vet ./...
# cmd/esxi-agent: prepare_dir
# CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
cmd/%: prepare_dir
CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
$(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
rpm/%: cmd/%
$(BUILD_SCRIPT) $*
deb/%: cmd/%
$(DEB_BUILD_SCRIPT) $*
pkg/%: prepare_dir
$(GO_INSTALL) $(REPO_PREFIX)/$@
@@ -102,9 +89,6 @@ build:
rpm:
$(MAKE) $(rpmTargets)
deb:
$(MAKE) $(debTargets)
rpmclean:
rm -fr $(BUILD_DIR)/rpms
@@ -129,11 +113,6 @@ clean:
fmt:
@git ls-files --exclude '*' '*.go' \
| grep -v '^vendor/' \
| while read f; do \
if ! grep -m1 -q '^// Code generated .* DO NOT EDIT\.$$' "$$f"; then \
echo "$$f"; \
fi ; \
done \
| xargs $(XARGS_FLAGS) gofmt -w
fmt-check: fmt
@@ -166,80 +145,14 @@ goimports-check:
echo "$@: working tree modified (possibly by goimports)" >&2 ; \
echo "$@: " >&2 ; \
echo "$@: import spec should be grouped in order: std, 3rd-party, yunion.io/x, yunion.io/x/onecloud" >&2 ; \
echo "$@: goimports should be installed by: \
echo "$@: git clone --depth 4 https://github.com/yunionio/tools && cd tools && go install ./cmd/goimports ; \
echo "$@: see \"yun\" branch at https://github.com/yousong/tools" >&2 ; \
false ; \
fi
.PHONY: goimports-check
vet-check:
./scripts/vet.sh gen
./scripts/vet.sh chk
.PHONY: vet-check
comma:=,
space:=$(space) $(space)
# NOTE: keep y18n-packages in alphabetical order
y18n-src-lang := en-US
y18n-lang := en-US,zh-CN
y18n-packages := \
yunion.io/x/onecloud/cmd/apigateway \
yunion.io/x/onecloud/cmd/keystone \
yunion.io/x/onecloud/cmd/llm \
yunion.io/x/onecloud/cmd/monitor \
yunion.io/x/onecloud/cmd/region \
yunion.io/x/onecloud/cmd/yunionconf \
define y18n-gen
set -o errexit; \
set -o pipefail; \
export GO111MODULE=off; \
y18n \
-chdir $(CURDIR) \
-dir ./locales/ \
-out ./locales/locales.go \
-lang $(y18n-lang) \
$(y18n-packages) \
; \
$(foreach lang,$(filter-out $(y18n-src-lang),$(subst $(comma), ,$(y18n-lang))),cp ./locales/$(lang)/{out,messages}.gotext.json;) \
endef
y18n-gen:
$(y18n-gen)
$(y18n-gen)
.PHONY: y18n-gen
y18n-check:
$(y18n-gen)
if git status --short ./locales | sed 's/^/$@: /' | grep .; then \
echo "$@: Locales content needs care" >&2 ; \
false; \
fi
.PHONY: y18n-check
define hostdeployer-grpc-gen
set -o errexit; \
set -o pipefail; \
protoc -I pkg/hostman/hostdeployer/apis \
--go_out=pkg/hostman/hostdeployer/apis \
--go_opt=paths=source_relative \
--go-grpc_out=pkg/hostman/hostdeployer/apis \
--go-grpc_opt=paths=source_relative \
pkg/hostman/hostdeployer/apis/deploy.proto
endef
hostdeployer-grpc-gen:
$(hostdeployer-grpc-gen)
check: fmt-check
check: gendocgo-check
#check: goimports-check
#check: vet-check
#check: y18n-check
check: goimports-check
.PHONY: check
@@ -261,21 +174,49 @@ dep:
@echo "$$depDeprecated"
@$(MAKE) mod
RELEASE_BRANCH:=master
GOPROXY ?= direct
mod:
GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get yunion.io/x/cloudmux@$(RELEASE_BRANCH)
GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | grep -v '/cloudmux$$'))
GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go mod tidy
GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go mod vendor -v
go get $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print | sed -n -e 's|.*\(yunion.io/x/[a-z][a-z]*\) v.*|\1|p'))
go mod tidy
go mod vendor -v
DOCKER_BUILD_IMAGE_VERSION?=latest
define dockerBuildCmd
set -o errexit
set -o pipefail
cd /home/build/onecloud
export GOFLAGS=-mod=vendor
make $(1)
endef
docker-build: export dockerBuildCmd:=$(call dockerBuildCmd,$(F))
docker-build:
echo "$$dockerBuildCmd"
docker rm --force onecloud-ci-build &>/dev/null || true
docker run \
--name onecloud-ci-build \
--rm \
--volume $(CURDIR):/home/build/onecloud \
yunionio/onecloud-ci:$(DOCKER_BUILD_IMAGE_VERSION) \
/bin/bash -c "$$dockerBuildCmd"
chown -R $$(id -u):$$(id -g) _output
ls -lh _output/bin
# NOTE we need a way to stop and remove the container started by docker-build.
# No --tty, --stop-signal won't work
docker-build-stop:
docker stop --time 0 onecloud-ci-build || true
.PHONY: docker-build
.PHONY: docker-build-stop
define helpText
Build with docker
make docker-alpine-build F='-j4'
make docker-alpine-build F='-j4 cmd/host cmd/host-deployer'
make docker-alpine-build-stop
make docker-build F='-j4'
make docker-build F='-j4 cmd/region cmd/climc'
make docker-build-stop
Tidy up go modules and vendor directory
@@ -285,49 +226,3 @@ endef
help: export helpText:=$(helpText)
help:
@echo "$$helpText"
.PHONY: help
gen-model-api-check:
which model-api-gen || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/model-api-gen)
gen-model-api: gen-model-api-check
$(ROOT_DIR)/scripts/codegen.py model-api
gen-swagger-check:
which swagger || (GO111MODULE=off go get -u github.com/go-swagger/go-swagger/cmd/swagger)
which swagger-gen || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/swagger-gen)
which swagger-serve || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/swagger-serve)
gen-swagger: gen-swagger-check
$(ROOT_DIR)/scripts/codegen.py swagger-code
$(ROOT_DIR)/scripts/codegen.py swagger-yaml
swagger-serve-only:
$(ROOT_DIR)/scripts/codegen.py swagger-serve
swagger-serve: gen-model-api gen-swagger swagger-serve-only
swagger-site: gen-model-api gen-swagger
$(ROOT_DIR)/scripts/codegen.py swagger-site
.PHONY: gen-model-api-check gen-model-api gen-swagger-check gen-swagger swagger-serve swagger-site
REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio"
VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
image:
mkdir -p $(ROOT_DIR)/_output
DEBUG=$(DEBUG) ARCH=$(ARCH) TAG=$(VERSION) REGISTRY=$(REGISTRY) $(ROOT_DIR)/scripts/docker_push.sh $(filter-out $@,$(MAKECMDGOALS))
.PHONY: image
image-telegraf-raid-plugin:
VERSION=v4.0-20260115.0 GOOS=linux ARCH=all make image telegraf-raid-plugin
%:
@:
ModName:=yunion.io/x/onecloud
include $(CURDIR)/Makefile.common.mk

View File

@@ -1,66 +0,0 @@
ifeq ($(__inc_Makefile_common_mk),)
__inc_Makefile_common_mk:=1
ifeq ($(ModName),)
$(error ModName must be set, e.g. yunion.io/x/onecloud)
endif
ModBaseName:=$(notdir $(ModName))
DockerImageRegistry?=registry.cn-beijing.aliyuncs.com
DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.23-go-1.26.3-0
EnvIf=$(if $($(1)),$(1)=$($(1)))
define dockerCentOSBuildCmd
set -o xtrace
set -o errexit
set -o pipefail
git config --global --add safe.directory /root/go/src/yunion.io/x/$(ModBaseName)
cd /root/go/src/yunion.io/x/$(ModBaseName)
env \
$(call EnvIf,GOARCH) \
$(call EnvIf,GOOS) \
$(call EnvIf,CGO_ENABLED) \
make $(1)
chown -R $(shell id -u):$(shell id -g) _output
endef
tmpName=$(ModBaseName)-$(shell date +"%Y%m%d.%H%M%S%3N")
define dockerAlpineBuildCmd
set -o xtrace
set -o errexit
set -o pipefail
git config --global --add safe.directory /root/go/src/yunion.io/x/$(ModBaseName)
cd /root/go/src/yunion.io/x/$(ModBaseName)
git config --global --add safe.directory /root/go/src/yunion.io/x/onecloud
env \
$(call EnvIf,GOARCH) \
$(call EnvIf,GOOS) \
$(call EnvIf,CGO_ENABLED) \
make $(1)
chown -R $(shell id -u):$(shell id -g) _output
endef
docker-alpine-build: export dockerAlpineBuildCmd:=$(call dockerAlpineBuildCmd,$(F))
docker-alpine-build:
docker rm --force docker-alpine-build-$(tmpName) &>/dev/null || true
docker run \
--rm \
--name docker-alpine-build-$(tmpName) \
-v $(CURDIR):/root/go/src/yunion.io/x/$(ModBaseName) \
-v $(CURDIR)/_output/alpine-build:/root/go/src/yunion.io/x/$(ModBaseName)/_output \
-v $(CURDIR)/_output/alpine-build/_cache:/root/.cache \
$(DockerImageAlpineBuild) \
/bin/sh -c "$$dockerAlpineBuildCmd"
ls -lh _output/alpine-build/bin
docker-alpine-build-stop:
docker stop --time 0 docker-alpine-build-$(tmpName) || true
.PHONY: docker-alpine-build
.PHONY: docker-alpine-build-stop
endif # __inc_Makefile_common_mk

9
OWNERS
View File

@@ -1,6 +1,13 @@
# See the OWNERS docs at https://go.k8s.io/owners
approvers:
reviewers:
- swordqiu
- yousong
- wanyaoqi
- Zexi
- ioito
- tb365
approvers:
- swordqiu
- yousong
- wanyaoqi
- Zexi

View File

@@ -1,122 +0,0 @@
# Cloudpods
[![CircleCI](https://circleci.com/gh/yunionio/cloudpods.svg?style=svg)](https://circleci.com/gh/yunionio/cloudpods)
[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/cloudpods)](https://goreportcard.com/report/github.com/yunionio/cloudpods)
[简体中文](./README-CN.md) | [English](./README.md)
## Cloudpods是什么?
<img src="https://v1.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的云平台也就是一个”云上之云”。Cloudpods不仅可以管理本地的虚拟机和物理机资源还可以管理多个云平台和云账号。Cloudpods隐藏了这些异构基础设施资源的数据模型和API的差异对外暴露了一套统一的API允许用户就像用一个云一样地访问多云。从而大大降低了访问多云的复杂度提升了管理多云的效率。
Cloudpods还提供了 **AI 云**一个面向大语言模型LLM推理与 AI 容器应用的统一管理平台,帮助企业在同一平台完成 AI 工作负载的部署、调度与运维,与 Cloudpods 私有云/多云资源体系无缝集成。
## 谁需要Cloudpods?
* 将几台物理服务器虚拟化成一个私有云平台
* 需要一个紧凑而且功能相对完整的物理机全生命周期管理工具
* 将VMware vSphere虚拟化集群转换为一个可以自服务的私有云平台
* 在混合云的场景,能够在一个界面访问私有云和公有云
* 通过一个集中的入口访问分布在多个公有云平台上的多个账号
* 当前只使用一个公有云账号但希望将来使用多云的用户
* 需要部署和管理 LLM 推理服务及 AI 容器应用,并需要 GPU 调度支持的用户
## 功能
请访问[产品介绍](https://www.cloudpods.org/docs/introduction/)页面了解详细信息。
### AI 云
* **AI 推理服务**:部署和管理 LLM 推理实例(支持 Ollama、vLLM、SGLang 等),支持 GPU 调度、模型挂载与推理服务地址分配。
* **AI 应用管理**:一站式部署 LLM 应用编排、智能体助手、图像生成等 AI 容器应用。
* **模型库**:统一管理模型来源、版本与缓存,支持多实例复用、离线分发,避免重复下载。
* **模板与镜像**:通过模板定义 CPU/内存/GPU 等资源规格,通过镜像管理容器运行环境,实现标准化交付。
* **GPU 运维**GPU 设备自动探测与注册,支持 NVIDIA/CUDA 环境的统一配置与管理。
支持的 AI 工作负载:
* AI 推理Ollama、vLLM、SGLang
* AI 应用OpenClaw、Dify、ComfyUI、Hermes Agent
### 支持的云平台
* 公有云:
* AWS
* Azure
* Google Cloud Platform
* 阿里云
* 华为云
* 腾讯云
* UCloud
* 天翼云
* 移动云
* 京东云
* 火山引擎
* 百度云
* 金山云
* 青云
* Oracle Cloud
* 联通云
* 私有云:
* OpenStack
* ZStack
* Alibaba Cloud Apsara (阿里飞天)
* Huawei HCSO (华为HCSO)
* Nutanix
* BingoCloud
* OceanBase
* 本地基础设施资源:
* 基于 KVM 实现的轻量级私有云
* VMware vSphere vCenter/ESXi
* Proxmox VE
* 裸金属 (IPMI, Redfish API)
* 对象存储 (Minio, Ceph, XSky)
* NAS (Ceph)
### 支持的云资源
* 服务器实例、磁盘、网卡、网络、VPC、存储、宿主机、二层网络、快照、快照策略、安全组、弹性 IP、SSH 密钥对、镜像
* 负载均衡实例、监听、后端服务器组、后端服务器、TLS 证书、访问控制
* 对象存储:存储桶、对象
* NAS文件系统、权限组、挂载点
* RDS实例、账号、备份、数据库、参数、权限
* 弹性缓存:实例、账号、备份、参数
* DNSDNS 区域、DNS 记录
* VPCVPC、VPC 对等连接、跨 VPC 网络、NAT 网关、DNAT/SNAT 规则、路由表、路由条目
## 安装部署
请参考文档[安装部署](https://www.cloudpods.org/docs/getting-started/)选择合适的场景部署。
## 文档
* [Cloudpods文档](https://www.cloudpods.org/zh)
* [Swagger API文档](https://www.cloudpods.org/zh/docs/swagger/)
## 谁在使用Cloudpods
请在[这里](https://github.com/yunionio/cloudpods/issues/11427)查看Cloudpods用户列表。如果你正在使用Cloudpods欢迎回复留下你的信息。谢谢对Cloudpods的支持
## 联系我们
* 请查看[联系我们](https://www.cloudpods.org/docs/contact/)。
* TG群: [cloudpods](https://t.me/cloudpods_org)
## 版本历史
请查看[发布日志](https://www.cloudpods.org/docs/release-notes/)和[Changelog](https://www.cloudpods.org/docs/development/changelog/)。
## 贡献
欢迎和感谢任何形式的贡献,不局限于贡献代码,流程细节请查看 [CONTRIBUTING](./CONTRIBUTING_zh.md)。
## License
Apache license 2.0,详情请看 [LICENSE](./LICENSE)。
## AI生成文档
[DeepWiki](https://deepwiki.com/yunionio/cloudpods) 提供了对本项目代码详细和全面的AI解读可以参考。

127
README.md
View File

@@ -1,123 +1,10 @@
# Cloudpods
# Yunion OneCloud
[![CircleCI](https://circleci.com/gh/yunionio/cloudpods.svg?style=svg)](https://circleci.com/gh/yunionio/cloudpods)
[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/cloudpods)](https://goreportcard.com/report/github.com/yunionio/cloudpods)
[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud)
[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud)
[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud)
[English](./README.md) | [简体中文](./README-CN.md)
# 文档
## What is Cloudpods?
<img src="https://v1.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
Cloudpods is a cloud-native open source unified multi/hybrid-cloud platform developed with Golang, i.e. Cloudpods is *a cloud on clouds*. Cloudpods is able to manage not only on-premise KVM/baremetals, but also resources from many cloud accounts across many cloud providers. It hides the differences of underlying cloud providers and exposes one set of APIs that allow programatically interacting with these many clouds.
Cloudpods also provides **AI Cloud**, a unified management platform for large language model (LLM) inference and AI container applications, helping enterprises deploy, schedule, and operate AI workloads on a single platform, seamlessly integrated with the Cloudpods private cloud / multi-cloud resource ecosystem.
## Who needs Cloudpods?
* Those who need a simple solution to virtualize a few physical servers into a private cloud
* Those who need a compact and fully automatic baremetal lift-cycle management solution
* Those who want to turn a VMware vSphere virtualization cluster into a private cloud
* Those who need a cohesive view of both public and private cloud in a hybrid cloud setup
* Those who need a centric portal to access multiple accounts from multiple public clouds
* Those who is currently using a single cloud account, but will not lose the possibility to adopt multicloud strategy
* Those who need to deploy and manage LLM inference services and AI container applications with GPU support
## Features
See [Introduction](https://www.cloudpods.org/docs/introduction/) for details.
### AI Cloud
* **AI Inference Services**: Deploy and manage LLM inference instances (Ollama, vLLM, SGLang, and more) with GPU scheduling, model mounting, and inference service address allocation.
* **AI Application Management**: One-stop deployment of LLM application orchestration, agent assistants, image generation, and other AI container applications.
* **Model Library**: Unified management of model sources, versions, and caches, supporting multi-instance reuse and offline distribution.
* **Templates and Images**: Define resource specifications (CPU/memory/GPU) through templates, manage container runtime environments through images.
* **GPU Operations**: Automatic GPU device detection and registration, unified NVIDIA/CUDA environment configuration and management.
Supported AI workloads:
* AI Inference: Ollama, vLLM, SGLang
* AI Applications: OpenClaw, Dify, ComfyUI, Hermes Agent
### Supported cloud providers
* Public Clouds:
* AWS
* Azure
* Google Cloud Platform
* Alibaba Cloud
* Huawei Cloud
* Tencent Cloud
* UCloud
* Ctyun (China Telecom)
* ECloud (China Mobile)
* JDCloud
* Volcengine
* Baidu Cloud
* Kingsoft Cloud
* QingCloud
* Oracle Cloud
* China Unicom Cloud
* Private Clouds:
* OpenStack
* ZStack
* Alibaba Cloud Apsara
* Huawei HCSO
* Nutanix
* BingoCloud
* OceanBase
* On-premise resources:
* Lightweight private cloud built on KVM
* VMware vSphere vCenter/ESXi
* Proxmox VE
* Baremetals (IPMI, Redfish API)
* Object storages (Minio, Ceph, XSky)
* NAS (Ceph)
### Supported resources
* Servers: instances, disks, network interfaces, networks, vpcs, storages, hosts, wires, snapshots, snapshot policies, security groups, elastic IPs, SSH keypairs, images
* Load Balancers: instances, listeners, backend groups, backends, TLS certificates, ACLs
* Object Storage: buckets, objects
* NAS: file_systems, access_groups, mount_targets
* RDS: instances, accounts, backups, databases, parameters, privileges
* Elastic Cache: instances, accounts, backups, parameters
* DNS: DNS zones, DNS records
* VPC: VPCs, VPC peering, inter-VPC network, NAT gateway, DNAT/SNAT rules, route tables, route entries
## Getting started
Please refer to the document [Getting Started](https://www.cloudpods.org/en/docs/getting-started/) to select the appropriate scenario for installation.
## Documentations
* [Cloudpods Documents](https://www.cloudpods.org/en)
* [Swagger API](https://www.cloudpods.org/en/docs/swagger/)
## Who is using Cloudpods?
Please check this [issue](https://github.com/yunionio/cloudpods/issues/11427) for the user list of Cloudpods. If you are using Cloudpods, you are welcome to leave your information by responding the issue. Thank you for your support.
## Contact
* See [Contact Us](https://www.cloudpods.org/en/docs/contact/) for details.
* Telegram: [cloudpods](https://t.me/cloudpods_org)
## Changelog
See [Release Notes](https://www.cloudpods.org/en/docs/release-notes/) and [Changelog](https://www.cloudpods.org/en/docs/development/changelog/) for details.
## Contribution
You are welcome to do any kind of contribution to the project. Please refer to [CONTRIBUTING](./CONTRIBUTING.md) for guidelines.
## License
Apache License 2.0. See [LICENSE](./LICENSE).
## AI-generated doc
[DeepWiki](https://deepwiki.com/yunionio/cloudpods) provides an amazing AI-generated doc of this project, you may refer to it for more detailed and comprehensive understanding of codes.
- 文档中心https://docs.yunion.cn/
- API文档https://docs.yunion.cn/api/

View File

@@ -1 +0,0 @@
DESCRIPTION="Yunion Cloud AI Proxy Service"

View File

@@ -1,6 +1 @@
DESCRIPTION="Baremetal Agent Command Line Utility"
REQUIRES=(
ipmitool
mkisofs
)
DESCRIPTION="Baremetal Agent Command Line Utility"

View File

@@ -13,7 +13,6 @@ SRC_BUILD=$ROOT_DIR/build
OUTPUT_DIR=$ROOT_DIR/_output/rpms
PKG=$1
BIN_PATH=${2:-/opt/yunion/bin}
if [ -z "$PKG" ]; then
echo "Usage: $0 <package>"
@@ -36,12 +35,6 @@ fi
. $ROOT/vars
BUILDROOT=$(mktemp -d 2>/dev/null || mktemp -d -t 'yunion')
function cleanup {
rm -rf "$BUILDROOT"
echo "Deleted temp working directory $BUILDROOT"
}
# register the cleanup function to be called on the EXIT signal
trap cleanup EXIT
echo "Build root ${BUILDROOT}"
@@ -50,12 +43,7 @@ echo "Build root ${BUILDROOT}"
if [ -z "$VERSION" ]; then
TAG=$(git describe --abbrev=0 --tags || echo testing)
VERSION=${TAG/\//-}
if [[ "$VERSION" =~ ^v0. ]]; then
VERSION=${VERSION/v0./}
elif [[ "$VERSION" =~ ^v ]]; then
VERSION=${VERSION/v/}
fi
VERSION=${VERSION//-/.}
VERSION=${VERSION/v/}
fi
RELEASE=`date +"%y%m%d%H"`
@@ -79,8 +67,6 @@ echo "# Yunion RPM spec
%global pkgname yunion-$PKG
%global homedir /var/run/%{owner}
%global use_systemd $SERVICE
%global debug_package %{nil}
%global __strip /usr/bin/eu-strip
Name: %{pkgname}
Version: $VERSION
@@ -104,95 +90,49 @@ $DESCRIPTION
%build
%install
install -D -m 0755 $BIN \$RPM_BUILD_ROOT$BIN_PATH/$PKG
install -D -m 0755 $BIN \$RPM_BUILD_ROOT/opt/yunion/bin/$PKG
for bin in $EXTRA_BINS; do
install -D -m 0755 $SRC_BIN/\$bin \$RPM_BUILD_ROOT$BIN_PATH/\$bin
install -D -m 0755 $SRC_BIN/\$bin \$RPM_BUILD_ROOT/opt/yunion/bin/\$bin
done
if [ -d $ROOT/root ]; then
rsync -a $ROOT/root/ \$RPM_BUILD_ROOT
fi
%pre" > $SPEC_FILE
if [ -f $ROOT/preinst ]; then
cat $ROOT/preinst >> $SPEC_FILE
else
echo "
%pre
%if %{use_systemd}
getent group %{owner} >/dev/null || /usr/sbin/groupadd -r %{owner}
getent passwd %{owner} >/dev/null || /usr/sbin/useradd -r -s /sbin/nologin -d %{homedir} -M -g %{owner} %{owner}
%endif
" >> $SPEC_FILE
fi
echo "
%post" >> $SPEC_FILE
if [ -f $ROOT/postinst ]; then
cat $ROOT/postinst >> $SPEC_FILE
else
echo "
%post
%if %{use_systemd}
mkdir -p /var/run/%{owner}
chown -R %{owner}:%{owner} /var/run/%{owner}
/usr/bin/systemctl preset %{pkgname}.service >/dev/null 2>&1 ||:
%endif
" >> $SPEC_FILE
fi
echo "
%preun" >> $SPEC_FILE
if [ -f $ROOT/prerm ]; then
cat $ROOT/prerm >> $SPEC_FILE
else
echo "
%preun
%if %{use_systemd}
/usr/bin/systemctl --no-reload disable %{pkgname}.service >/dev/null 2>&1 || :
/usr/bin/systemctl stop %{pkgname}.service >/dev/null 2>&1 ||:
%endif
" >> $SPEC_FILE
fi
echo "
%postun" >> $SPEC_FILE
if [ -f $ROOT/postrm ]; then
cat $ROOT/postrm >> $SPEC_FILE
else
echo "
%postun
%if %{use_systemd}
/usr/bin/systemctl daemon-reload >/dev/null 2>&1 ||:
%endif
" >> $SPEC_FILE
fi
echo -n "
%files
%doc
$BIN_PATH/$PKG
" >> $SPEC_FILE
for b in $EXTRA_BINS; do
echo $BIN_PATH/$b >> $SPEC_FILE
done
/opt/yunion/bin/$PKG
$(for b in $EXTRA_BINS; do echo /opt/yunion/bin/$b; done)
" > $SPEC_FILE
if [ -d $ROOT/root/ ]; then
find $ROOT/root/ -type f | sed -e "s:$ROOT/root::g" >> $SPEC_FILE
fi
TARGET=
case "$GOARCH" in
"arm64" | "aarch64" | "arm")
TARGET="--target aarch64-redhat-linux"
;;
"amd64" | "x86" | "i686" | "i386" | "x86_64")
TARGET="--target x86_64-redhat-linux"
;;
"riscv64")
TARGET="--target riscv64-linux"
;;
esac
rpmbuild --define "_topdir $BUILDROOT" -bb $SPEC_FILE $TARGET
rpmbuild --define "_topdir $BUILDROOT" -bb $SPEC_FILE
find $RPM_DIR -type f | while read f; do
d="$(dirname "$f")"
@@ -200,3 +140,5 @@ find $RPM_DIR -type f | while read f; do
mkdir -p "$d"
cp $f $d
done
rm -fr $BUILDROOT

View File

@@ -1,175 +0,0 @@
#!/bin/bash
set -e
if [ -z "$ROOT_DIR" ]; then
pushd $(dirname $(readlink -f "$BASH_SOURCE")) > /dev/null
ROOT_DIR=$(cd .. && pwd)
popd > /dev/null
fi
SRC_BIN=$ROOT_DIR/_output/bin
SRC_BUILD=$ROOT_DIR/build
OUTPUT_DIR=$ROOT_DIR/_output/debs
PKG=$1
BIN_PATH=${2:-/opt/yunion/bin}
if [ -z "$PKG" ]; then
echo "Usage: $0 <package>"
exit 1
fi
BIN="$SRC_BIN/$PKG"
ROOT="$SRC_BUILD/$PKG"
if [ ! -x "$BIN" ]; then
echo "$BIN not exists"
exit 1
fi
if [ ! -x "$ROOT" ]; then
echo "$ROOT not exists"
exit 1
fi
. $ROOT/vars
case $(uname -m) in
x86_64)
CURRENT_ARCH=amd64
;;
aarch64)
CURRENT_ARCH=arm64
;;
riscv64)
CURRENT_ARCH=riscv64
;;
esac
if [[ -n "$GOARCH" ]]; then
case "$GOARCH" in
"arm64" | "arm" | "aarch64")
CURRENT_ARCH="arm64"
;;
"x86" | "x86_64" | "i686" | "i386" | "amd64")
CURRENT_ARCH="amd64"
;;
"riscv64")
CURRENT_ARCH="riscv64"
;;
esac
fi
if [ -z "$VERSION" ]; then
TAG=$(git describe --abbrev=0 --tags || echo 000000)
VERSION=${TAG/\//-}
VERSION=${VERSION/v/}
VERSION=${VERSION/master-/}
fi
RELEASE=`date +"%y%m%d%H"`
FULL_VERSION=$VERSION-$RELEASE
BUILDROOT=$OUTPUT_DIR/yunion-${PKG}-${FULL_VERSION}_${CURRENT_ARCH}
function cleanup {
rm -rf "$BUILDROOT"
echo "Deleted temp working directory $BUILDROOT"
}
# register the cleanup function to be called on the EXIT signal
trap cleanup EXIT
rm -rf $BUILDROOT
mkdir -p $BUILDROOT/DEBIAN
mkdir -p $BUILDROOT/$BIN_PATH
cp -rf $BIN $BUILDROOT/$BIN_PATH
if [ -d $ROOT/root ]; then
cp -rf $ROOT/root/* $BUILDROOT/
fi
echo "Build root ${BUILDROOT}"
echo "Package: yunion-$PKG
Version: $FULL_VERSION
Section: base
Priority: optional
Architecture: $CURRENT_ARCH
Maintainer: wanyaoqi@yunionyun.com
Description: $DESCRIPTION" > $BUILDROOT/DEBIAN/control
if [ ${#REQUIRES[@]} -gt 0 ]; then
DEPS=$(IFS=, ; echo "${REQUIRES[*]}")
echo "Depends: $DEPS" >> $BUILDROOT/DEBIAN/control
fi
chmod 0755 $BUILDROOT/DEBIAN/control
cat $BUILDROOT/DEBIAN/control
echo "#!/bin/bash
" > $BUILDROOT/DEBIAN/preinst
if [ -f $ROOT/preinst ]; then
cat $ROOT/preinst >> $BUILDROOT/DEBIAN/preinst
else
if [ "$SERVICE" == "yes" ] && [ -n "$OWNER" ]; then
echo "
getent group ${OWNER} >/dev/null || /usr/sbin/groupadd -r ${OWNER}
getent passwd ${OWNER} >/dev/null || /usr/sbin/useradd -r -s /sbin/nologin -d /home/${OWNER} -M -g ${OWNER} ${OWNER}
" >> $BUILDROOT/DEBIAN/preinst
fi
fi
chmod 0755 $BUILDROOT/DEBIAN/preinst
echo "#!/bin/bash
" > $BUILDROOT/DEBIAN/postinst
if [ -f $ROOT/postinst ]; then
cat $ROOT/postinst >> $BUILDROOT/DEBIAN/postinst
else
if [ "$SERVICE" == "yes" ]; then
echo "
/usr/bin/systemctl preset yunion-${PKG}.service >/dev/null 2>&1 ||:
" >> $BUILDROOT/DEBIAN/postinst
fi
fi
chmod 0755 $BUILDROOT/DEBIAN/postinst
echo "#!/bin/bash
" > $BUILDROOT/DEBIAN/prerm
if [ -f $ROOT/prerm ]; then
cat $ROOT/prerm >> $BUILDROOT/DEBIAN/prerm
else
if [ "$SERVICE" == "yes" ]; then
echo "
/usr/bin/systemctl --no-reload disable yunion-${PKG}.service >/dev/null 2>&1 || :
/usr/bin/systemctl stop yunion-${PKG}.service >/dev/null 2>&1 ||:
" >> $BUILDROOT/DEBIAN/prerm
fi
fi
chmod 0755 $BUILDROOT/DEBIAN/prerm
echo "#!/bin/bash
" > $BUILDROOT/DEBIAN/postrm
if [ -f $ROOT/postrm ]; then
cat $ROOT/postrm >> $BUILDROOT/DEBIAN/postrm
else
if [ "$SERVICE" == "yes" ]; then
echo "
/usr/bin/systemctl daemon-reload >/dev/null 2>&1 ||:
" >> $BUILDROOT/DEBIAN/postrm
fi
fi
chmod 0755 $BUILDROOT/DEBIAN/postrm
dpkg-deb --build $BUILDROOT
case "$CURRENT_ARCH" in
"amd64")
DSTARCH="x86_64"
;;
"arm64")
DSTARCH="aarch64"
;;
"riscv64")
DSTARCH="riscv64"
;;
esac
mkdir -p ${OUTPUT_DIR}/${DSTARCH}
mv ${BUILDROOT}.deb ${OUTPUT_DIR}/${DSTARCH}/

View File

@@ -1,19 +0,0 @@
#!/bin/bash
set -e
BASHRC=/etc/profile.d/climc.sh
grep -q rcadmin $BASHRC || echo 'source /etc/yunion/rcadmin' >> $BASHRC
source $BASHRC
climc sshkeypair-inject --admin --target-dir /root/
mkdir -p /etc/dropbear
mkdir -p /var/run/dropbear
test -f /etc/dropbear/dropbear_rsa_host_key || dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
dropbear -RFEjk -G root -p 22

View File

@@ -1,22 +0,0 @@
export PATH=/opt/yunion/bin:$PATH
if [ -f /etc/profile.d/bash_completion.sh ]; then
source /etc/profile.d/bash_completion.sh
fi
test -f /etc/yunion/rcadmin && source /etc/yunion/rcadmin
if [ -n "$OS_AUTH_TOKEN" ]; then
test -n "$OS_USERNAME" && unset OS_USERNAME
test -n "$OS_PASSWORD" && unset OS_PASSWORD
test -n "$OS_DOMAIN_NAME" && unset OS_DOMAIN_NAME
test -n "$OS_ACCESS_KEY" && unset OS_ACCESS_KEY
test -n "$OS_SECRET_KEY" && unset OS_SECRET_KEY
fi
source <(climc --completion bash)
source <(kubectl completion bash)
echo "Welcome to Cloud Shell :-) You may execute climc and other command tools in this shell."
echo "Please exec 'climc' to get started"
echo ""

View File

@@ -1,10 +0,0 @@
policy:
'*':
'*':
'*': allow
create: deny
delete: deny
perform:
purge: deny
clone: deny
'*': allow

View File

@@ -1,2 +0,0 @@
policy:
'*': allow

View File

@@ -1,6 +0,0 @@
policy:
'*':
'*':
get: allow
list: allow
'*': deny

View File

@@ -1,42 +0,0 @@
#!/bin/bash
set -e
pushd $(dirname $BASH_SOURCE) > /dev/null
CUR_DIR=$(pwd -P)
popd > /dev/null
ACCOUNT=$1
if [ -z "$ACCOUNT" ]; then
echo "Usage: $0 <cloud-acount-id-or-name>"
exit 1
fi
ACCOUNT_ID=$(climc cloud-account-show $ACCOUNT | grep -w " id " | awk '{print $4}')
ACCOUNT_NAME=$(climc cloud-account-show $ACCOUNT | grep -w " name " | awk '{print $4}')
if [ -z "$ACCOUNT_ID" ]; then
echo "Cloud account $ACCOUNT not found"
exit 1
fi
echo "Ready to clean cloud account $ACCOUNT_NAME($ACCOUNT_ID)..."
echo "1. Disable cloud account $ACCOUNT_NAME($ACCOUNT_ID) ..."
climc cloud-account-disable $ACCOUNT_ID
echo "2. Clean all providers ..."
for provider_id in $(climc cloud-provider-list --account $ACCOUNT_ID --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
echo "### to clean cloud provider $provider_id ..."
$CUR_DIR/clean_provider.sh $provider_id
done
echo "3. Delete cloud account ..."
climc cloud-account-delete $ACCOUNT_ID

View File

@@ -1,27 +0,0 @@
#/bin/bash
set -e
EIP=$1
if [ -z "$EIP" ]; then
echo "Usage: $0 <eip_id_or_name>"
exit 1
fi
EIP_NAME=$(climc eip-show $EIP | grep -w " name " | awk '{print $4}')
EIP_ID=$(climc eip-show $EIP | grep -w " id " | awk '{print $4}')
if [ -z "$EIP_ID" ]; then
echo "Cannot find eip $EIP_ID"
exit 1
fi
echo "To clean eip $EIP_NAME($EIP_ID)..."
clean_eip() {
local EID=$1
climc eip-purge $EID
}
clean_eip $EIP_ID

View File

@@ -1,85 +0,0 @@
#!/bin/bash
set -e
HOST=$1
if [ -z "$HOST" ]; then
echo "Usage: $0 <host_id_or_name>"
exit 1
fi
error_exit() {
echo "Error: $1"
exit 1
}
HOSTID=$(climc host-show $HOST | grep -w " id " | awk '{print $4}')
HOSTNAME=$(climc host-show $HOST | grep -w " name " | awk '{print $4}')
if [ -z "$HOSTNAME" ]; then
error_exit "Cannot find host $HOST"
fi
if [ -z "$HOSTID" ]; then
error_exit "Cannot find host $HOST"
fi
echo "Ready to purge host $HOSTNAME($HOSTID)..."
echo "1. Disable $HOSTNAME($HOSTID)"
if ! climc host-disable $HOSTID > /dev/null; then
error_exit "Fail to disable $HOST"
fi
echo "2. Clean servers on $HOSTNAME($HOSTID)"
for i in $(climc server-list --host $HOSTID --admin --limit 2048 --system | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
climc server-update --delete enable $i > /dev/null
climc server-purge $i > /dev/null
done
for i in $(climc server-list --host $HOSTID --admin --limit 2048 --pending-delete --system | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
climc server-purge $i > /dev/null
done
for i in $(climc server-list --admin --limit 2048 --system --filter "backup_host_id.equals($HOSTID)" | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
climc server-delete-backup $i > /dev/null
done
echo "3. Clean disks on $HOSTNAME($HOSTID)"
for storageid in $(climc host-storage-list --host $HOSTID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $4}')
do
STORAGENAME=$(climc storage-show $storageid | grep -w " name " | awk '{print $4}')
STORAGE_TYPE=$(climc storage-show $storageid | grep -w " storage_type " | awk '{print $4}')
if [ "$STORAGE_TYPE" == "local" ]; then
for diskid in $(climc disk-list --admin --system --details --search $storageid --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
climc disk-purge $diskid > /dev/null
done
for diskid in $(climc disk-list --admin --system --details --search $storageid --pending-delete --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
climc disk-purge $diskid > /dev/null
done
fi
done
echo "4. Remove host $HOSTNAME($HOSTID)"
BAREMETAL=$(climc host-show $HOSTID | grep -w " is_baremetal " | awk '{print $4}')
HOSTTYPE=$(climc host-show $HOSTID | grep -w " host_type " | awk '{print $4}')
if [ "$BAREMETAL" == "true" ] && [ "$HOSTTYPE" != "baremetal" ]; then
climc host-update --host-type baremetal $HOSTID > /dev/null
fi
climc host-delete $HOSTID > /dev/null
echo "DONE."

View File

@@ -1,27 +0,0 @@
#!/bin/bash
set -e
LB=$1
if [ -z "$LB" ]; then
echo "Usage: $0 <loadbalancer_id_or_name>"
exit 1
fi
LB_ID=$(climc lb-show $LB | grep -w " id " | awk '{print $4}')
LB_NAME=$(climc lb-show $LB | grep -w " name " | awk '{print $4}')
if [ -z "$LB_ID" ]; then
echo "Loadbalancer $LB not found"
exit 1
fi
echo "Ready to remove loadbalancer $LB_NAME($LB_ID) ..."
clean_loadbalancer() {
local LID=$1
climc lb-purge $LID
}
clean_loadbalancer $LB_ID

View File

@@ -1,27 +0,0 @@
#!/bin/bash
set -e
LB_ACL=$1
if [ -z "$LB_ACL" ]; then
echo "Usage: $0 <loadbalancer_id_or_name>"
exit 1
fi
LB_ACL_ID=$(climc lbacl-show $LB_ACL | grep -w " id " | awk '{print $4}')
LB_ACL_NAME=$(climc lbacl-show $LB_ACL | grep -w " name " | awk '{print $4}')
if [ -z "$LB_ACL_ID" ]; then
echo "Loadbalancer ACL $LB_ACL_ID not found"
exit 1
fi
echo "Ready to remove loadbalancer acl $LB_ACL_NAME($LB_ACL_ID) ..."
clean_loadbalancer_acl() {
local LID=$1
climc lbacl-purge $LID
}
clean_loadbalancer_acl $LB_ACL_ID

View File

@@ -1,27 +0,0 @@
#!/bin/bash
set -e
LB_CERT=$1
if [ -z "$LB_CERT" ]; then
echo "Usage: $0 <loadbalancer_id_or_name>"
exit 1
fi
LB_CERT_ID=$(climc lbcert-show $LB_CERT | grep -w " id " | awk '{print $4}')
LB_CERT_NAME=$(climc lbcert-show $LB_CERT | grep -w " name " | awk '{print $4}')
if [ -z "$LB_CERT_ID" ]; then
echo "Loadbalancer certificate $LB_CERT_ID not found"
exit 1
fi
echo "Ready to remove loadbalancer certificate $LB_CERT_NAME($LB_CERT_ID) ..."
clean_loadbalancer_cert() {
local LID=$1
climc lbcert-purge $LID
}
clean_loadbalancer_cert $LB_CERT_ID

View File

@@ -1,96 +0,0 @@
#!/bin/bash
set -e
pushd $(dirname $BASH_SOURCE) > /dev/null
CUR_DIR=$(pwd -P)
popd > /dev/null
PROVIDER=$1
if [ -z "$PROVIDER" ]; then
echo "Usage: $0 <cloud-provider-id-or-name>"
exit 1
fi
PROVIDER_ID=$(climc cloud-provider-show $PROVIDER | grep -w " id " | awk '{print $4}')
PROVIDER_NAME=$(climc cloud-provider-show $PROVIDER | grep -w " name " | awk '{print $4}')
if [ -z "$PROVIDER_ID" ]; then
echo "Cloud provider $PROVIDER not found"
exit 1
fi
echo "Ready to clean cloud provider $PROVIDER_NAME($PROVIDER_ID)..."
echo "1. Disable cloud provider $PROVIDER_NAME($PROVIDER_ID) ..."
climc cloud-provider-disable $PROVIDER_ID
echo "2. Clean all hosts ..."
for hostid in $(climc host-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
$CUR_DIR/clean_host.sh $hostid
done
echo "3. Clean all loadbalancer ..."
for lbid in $(climc lb-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
$CUR_DIR/clean_loadbalancer.sh $lbid
done
echo "4. Clean all loadbalancer acl ..."
for lbaclid in $(climc lbacl-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
$CUR_DIR/clean_loadbalancer_acl.sh $lbaclid
done
echo "5. Clean all loadbalancer certificate ..."
for lbcertid in $(climc lbcert-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
$CUR_DIR/clean_loadbalancer_certificate.sh $lbcertid
done
echo "6. Clean all vpc ..."
for vpcid in $(climc vpc-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
$CUR_DIR/clean_vpc.sh $vpcid
done
echo "7. Clean all eips ..."
for eipid in $(climc eip-list --admin --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
$CUR_DIR/clean_eip.sh $eipid
done
echo "8. Clean all snapshots ..."
for snapid in $(climc snapshot-list --admin --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
echo "to clean snapshot $snapid ..."
$CUR_DIR/clean_snapshot.sh $snapid
done
echo "9. Clean all storagecache ..."
for cacheid in $(climc storage-cache-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
$CUR_DIR/clean_storagecache.sh $cacheid
done
echo "10. Clean all storages ..."
for storeid in $(climc storage-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
$CUR_DIR/clean_storage.sh $storeid
done
echo "Delete cloud provider ..."
climc cloud-provider-delete $PROVIDER_ID

View File

@@ -1,27 +0,0 @@
#/bin/bash
set -e
SNAPSHOT=$1
if [ -z "$SNAPSHOT" ]; then
echo "Usage: $0 <snapshot_id_or_name>"
exit 1
fi
SNAPSHOT_NAME=$(climc snapshot-show $SNAPSHOT | grep -w " name " | awk '{print $4}')
SNAPSHOT_ID=$(climc snapshot-show $SNAPSHOT | grep -w " id " | awk '{print $4}')
if [ -z "$SNAPSHOT_ID" ]; then
echo "Cannot find snapshot $SNAPSHOT_ID"
exit 1
fi
echo "To clean snapshot $SNAPSHOT_NAME($SNAPSHOT_ID)..."
clean_snapshot() {
local SNAP_ID=$1
climc snapshot-purge $SNAP_ID > /dev/null
}
clean_snapshot $SNAPSHOT_ID

View File

@@ -1,34 +0,0 @@
#!/bin/bash
set -e
STORAGE=$1
if [ -z "$STORAGE" ]; then
echo "Usage: $0 <storage_id_or_name>"
exit 1
fi
STORAGE_ID=$(climc storage-show $STORAGE | grep -w " id " | awk '{print $4}')
STORAGE_NAME=$(climc storage-show $STORAGE | grep -w " name " | awk '{print $4}')
if [ -z "$STORAGE_ID" ]; then
echo "Storage $STORAGE not found"
exit 1
fi
echo "Clean disks on storage $STORAGE_NAME($STORAGE_ID) ..."
for disk_id in $(climc disk-list --admin --storage $STORAGE_ID --show-emulated --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
climc disk-purge $disk_id > /dev/null
done
for disk_id in $(climc disk-list --admin --storage $STORAGE_ID --show-emulated --pending-delete --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
climc disk-purge $disk_id > /dev/null
done
# CACHE_ID=$(climc storage-show $STORAGE_ID | grep -w " storagecache_id " | awk '{print $4}')
climc storage-delete $STORAGE_ID > /dev/null

View File

@@ -1,28 +0,0 @@
#!/bin/bash
set -e
CACHE=$1
if [ -z "$CACHE" ]; then
echo "Usage: $0 <storage_cache_id_or_name>"
exit 1
fi
CACHE_ID=$(climc storage-cache-show $CACHE | grep -w " id " | awk '{print $4}')
CACHE_NAME=$(climc storage-cache-show $CACHE | grep -w " name " | awk '{print $4}')
if [ -z "$CACHE_ID" ]; then
echo "Storage cache $CACHE not found"
exit 1
fi
echo "Ready to remove storagecache $CACHE_NAME($CACHE_ID) ..."
for imgid in $(climc storage-cached-image-list --storagecache $CACHE_ID --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $4}')
do
climc storagecache-uncache-image $CACHE_ID $imgid --force # > /dev/null
done
climc storage-cache-delete $CACHE_ID > /dev/null

View File

@@ -1,55 +0,0 @@
#/bin/bash
set -e
VPC=$1
if [ -z "$VPC" ]; then
echo "Usage: $0 <vpc_id_or_name>"
exit 1
fi
VPC_NAME=$(climc vpc-show $VPC | grep -w " name " | awk '{print $4}')
VPC_ID=$(climc vpc-show $VPC | grep -w " id " | awk '{print $4}')
if [ -z "$VPC_ID" ]; then
echo "Cannot find vpc $VPC"
exit 1
fi
echo "To clean vpc $VPC_NAME($VPC_ID)..."
clean_network() {
climc network-purge $1 > /dev/null
}
clean_wire() {
local WIRE_ID=$1
for net_id in $(climc network-list --admin --wire $WIRE_ID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
clean_network $net_id
done
climc wire-delete $wire_id > /dev/null
}
clean_vpc() {
local VPC_ID=$1
climc vpc-purge $VPC_ID > /dev/null
}
echo "1. Clean wires ..."
for wire_id in $(climc wire-list --vpc $VPC_ID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
clean_wire $wire_id
done
echo "2. Clean route tables ..."
for routetable_id in $(climc routetable-list --vpc $VPC_ID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
climc routetable-purge $routetable_id >/dev/null
done
echo "3. clean vpc ..."
clean_vpc $VPC_ID

View File

@@ -1 +0,0 @@
DESCRIPTION="Yunion Cloudevent"

View File

@@ -1,6 +0,0 @@
公有云子账号创建成功
主账号:{{ .account }}<br>
名称:{{ .name }}<br>
密码:{{ .password }}<br>
登录地址: {{ .iam_login_url }}<br>
资源ID: {{ .id }}<br>

View File

@@ -1,6 +0,0 @@
Clouduser has been created successfully
Root Account: {{ .account }}<br>
Name{{ .name }}<br>
Password{{ .password }}<br>
IAM Login URL: {{ .iam_login_url }}<br>
Resource ID: {{ .id }}<br>

View File

@@ -1 +0,0 @@
公有云子账号 {{ .name }} 创建成功

View File

@@ -1 +0,0 @@
The clouduser {{ .name }} created successfully

View File

@@ -1,47 +0,0 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:alibaba:cloudcomputing">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIDXjCCAkagAwIBAgIEXHToLjANBgkqhkiG9w0BAQsFADBwMQswCQYDVQQGEwJDTjERMA8GA1UE
CBMISGFuZ3pob3UxKTAnBgNVBAsTIEFsaWJhYmEgQ2xvdWQgQ29tcHV0aW5nIENvLiBMdGQuMSMw
IQYDVQQDExp1cm46YWxpYmFiYTpjbG91ZGNvbXB1dGluZzAgFw0xOTAyMjYwNzE4MDZaGA8yMTE5
MDIwMjA3MTgwNlowcDELMAkGA1UEBhMCQ04xETAPBgNVBAgTCEhhbmd6aG91MSkwJwYDVQQLEyBB
bGliYWJhIENsb3VkIENvbXB1dGluZyBDby4gTHRkLjEjMCEGA1UEAxMadXJuOmFsaWJhYmE6Y2xv
dWRjb21wdXRpbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDjD53ZENEHoYNXAOf
OIbVBJhj7SCWKmdjnbnxq8WAFWEeZtS6hZLPpWh1z7b0NjJkvCf5oFVqBJYbbW5kEKV+9CpV6VHZ
qOXmsIRlkvZB+Wnc3SduwiiiUR9JojSPxVQvSf4WLT+HDASlrBztuRV2vHj9utLbvy+6bgVBqF8g
emL9Pcif1robDH8HlqUcADXLAt18E4MbToldVoHjpFc6fAKUXujWH5feAL8g0CKlmf/JVlHLEtu4
vKPxBQ8sgkysk6EnrjXl6Q4a4t+vbPG5uczA1ouTkDupMCRlaWHIHaJL/AoDGabn8sVXdaVJUKC5
54FNkRznBhRQll+Nuc2rAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAE8k4S4HvOglthJwF3aMQXGi
LKW6Becs9SljA0/5VtZQDrDf2By/1BIMvWfZ/dFnO+MylDLVdS6XWvWat/DW0fOGxU4s1WNfshX7
DJDGR2G1XgtGoDZEYIDahUp5katAPypCkY57fGZlI0d3nq46/2qT/Zpne+pFE3DI/x8klZMniniw
YjNXbG96y/M4DYi1J7RR8mLIfVvz5o1SMGT4Ta2p/USE2M9F6O7/zc2j62dQgXiYa9OONo31RiXR
TmvGEUNuQoBZhVrFIvOnNjIfFT7Xd3CUowwJKP1floserrx4B5jScRAi9yK3x2a2lhfc+PksXfTs
aqIr5TQL4OorLEE=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
<AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.aliyun.com/saml-role/sso"/>
<AttributeConsumingService index="1">
<ServiceName xml:lang="en">Alibaba Cloud Console Single Sign-On</ServiceName>
<RequestedAttribute isRequired="true" Name="https://www.aliyun.com/SAML-Role/Attributes/Role" FriendlyName="RoleEntitlement"/>
<RequestedAttribute isRequired="true" Name="https://www.aliyun.com/SAML-Role/Attributes/RoleSessionName" FriendlyName="RoleSessionName"/>
<RequestedAttribute isRequired="false" Name="https://www.aliyun.com/SAML-Role/Attributes/SessionDuration" FriendlyName="SessionDuration"/>
</AttributeConsumingService>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Alibaba Cloud Computing Co. Ltd.</OrganizationName>
<OrganizationDisplayName xml:lang="en">AlibabaCloud</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://www.aliyun.com</OrganizationURL>
</Organization>
</EntityDescriptor>

View File

@@ -1,67 +0,0 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:amazon:webservices" validUntil="2021-06-02T00:00:00Z">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIDbTCCAlWgAwIBAgIEFWIThjANBgkqhkiG9w0BAQsFADBnMR8wHQYDVQQDExZ1
cm46YW1hem9uOndlYnNlcnZpY2VzMSIwIAYDVQQKExlBbWF6b24gV2ViIFNlcnZp
Y2VzLCBJbmMuMRMwEQYDVQQIEwpXYXNoaW5ndG9uMQswCQYDVQQGEwJVUzAeFw0y
MDA2MDIwMDAwMDBaFw0yMTA2MDIwMDAwMDBaMGcxHzAdBgNVBAMTFnVybjphbWF6
b246d2Vic2VydmljZXMxIjAgBgNVBAoTGUFtYXpvbiBXZWIgU2VydmljZXMsIElu
Yy4xEzARBgNVBAgTCldhc2hpbmd0b24xCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG
9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwKA4yDh4wAjlkhjJoXARGX9DQWsGTgp9GzoX
NebntY+DjB8H6hIkYRR3++yEDY90qldbZzOaOKRm2jyL7i+MgNt+ktx6wYGD7HBg
e8Z0Zh6eHRIwKbvu4/heMLdqqu+hlXkrC15T4N/LqiwT5JhPTrO4V1KG3ljR1ONG
7aLblVH2aRENV+X9la/AVAPesUpCnoUcTkuCJrcwHrv6hqWmadW8pJy/ISCCM4Fe
JuOAJD0whxg0qRFvE6xcdnKBTWjR03VHqJnyYQGVUKXOlgj8HiKO0JaJkoUAs5ox
WCRBZwSQW+qbP1VKSUfFeBtTMx/TSg4nBRYHinego/e8O1mu6wIDAQABoyEwHzAd
BgNVHQ4EFgQUz1SuekLVxYNvvLpUDRXc/gp2WdAwDQYJKoZIhvcNAQELBQADggEB
AIkUzM9MXr11vp9gBOOXyqyj7sBgoUQHW3mEfKD3DkEOZWUPW5UI7NM9ZHvhdOwd
C1noUK/QMjLkTHp0QB2bxCIpgThXSNFDYNRxf1/aUqTfxQ8a+i0q7l/utRiWyY3p
kLOFx0n81a2bSNz+B0nPS338xNaBtuNjHedXjxN6BjUCUfFHFsQmg/y6ZbBRN/9P
+i2yy3CjLduh0yeD0Of3vAoIh19MuNgnIy1pMsK/H59E8bAaCFvND9fnsqAfH29W
ppmt9c8QaiAya5R7akl/C0Rx8khQrba+wMcSultqLU+6YVIAAEKZ/S/ZfN74wn5X
RXwSXp4MSmOKYqRWshvRegQ=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
<AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.aws.amazon.com/saml"/>
<AttributeConsumingService index="1">
<ServiceName xml:lang="en">AWS Management Console Single Sign-On</ServiceName>
<RequestedAttribute isRequired="true" Name="https://aws.amazon.com/SAML/Attributes/Role" FriendlyName="RoleEntitlement"/>
<RequestedAttribute isRequired="true" Name="https://aws.amazon.com/SAML/Attributes/RoleSessionName" FriendlyName="RoleSessionName"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" FriendlyName="eduPersonAffiliation"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" FriendlyName="eduPersonNickname"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" FriendlyName="eduPersonOrgDN"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" FriendlyName="eduPersonOrgUnitDN"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" FriendlyName="eduPersonPrimaryAffiliation"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" FriendlyName="eduPersonEntitlement"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" FriendlyName="eduPersonScopedAffiliation"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" FriendlyName="eduPersonTargetedID"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" FriendlyName="eduPersonAssurance"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.2" FriendlyName="eduOrgHomePageURI"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.3" FriendlyName="eduOrgIdentityAuthNPolicyURI"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" FriendlyName="eduOrgLegalName"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.5" FriendlyName="eduOrgSuperiorURI"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.6" FriendlyName="eduOrgWhitePagesURI"/>
<RequestedAttribute isRequired="false" Name="urn:oid:2.5.4.3" FriendlyName="cn"/>
</AttributeConsumingService>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Amazon Web Services, Inc.</OrganizationName>
<OrganizationDisplayName xml:lang="en">AWS</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://aws.amazon.com</OrganizationURL>
</Organization>
</EntityDescriptor>

View File

@@ -1,67 +0,0 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:amazon:webservices:cn-north-1" validUntil="2021-05-13T00:00:00Z">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIDfzCCAmegAwIBAgIEY1tz5jANBgkqhkiG9w0BAQsFADBwMSgwJgYDVQQDEx91
cm46YW1hem9uOndlYnNlcnZpY2VzOmNuLW5vcnRoMSIwIAYDVQQKExlBbWF6b24g
V2ViIFNlcnZpY2VzLCBJbmMuMRMwEQYDVQQIEwpXYXNoaW5ndG9uMQswCQYDVQQG
EwJVUzAeFw0yMDA1MTMwMDAwMDBaFw0yMTA1MTMwMDAwMDBaMHAxKDAmBgNVBAMT
H3VybjphbWF6b246d2Vic2VydmljZXM6Y24tbm9ydGgxIjAgBgNVBAoTGUFtYXpv
biBXZWIgU2VydmljZXMsIEluYy4xEzARBgNVBAgTCldhc2hpbmd0b24xCzAJBgNV
BAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm2HLuzEnEGVT
C5W215HWuwFLM54v3oHoNy52GGN79VLn7sxm2Z0K+AVijV/rxCbPaNxO6tm/MmN6
XJkU8g8p7ghT6p+EN/61WG+KgoXIHcl/aZBbkoNTKKPXRvR9EEcyAPdLDBJVJHF5
lgCkSMHBL3VcCcrpVxFCtUhW+vT3pie2KHLEVb5Ocpq9pO8dNvY2iM7TSIvRu0kL
IZWUbRF0bP4cpDIVoMEsSJ3gFBCD3yf53UfU2dxjp2mnMjphPucHwml3AcsXN3XT
Y5j2qksO5xXgFrCZz76l3P7emj5eHIvkxuieU/7u+cYu0HppP+4xszzqvUcoHFRA
1fC/eFFRAwIDAQABoyEwHzAdBgNVHQ4EFgQUZkQfgy0NWq7kAO8mTQPeSDayJ3Ew
DQYJKoZIhvcNAQELBQADggEBACmLLD2qBA+KCxv7CiCfznT8XWOLAVf9xP3YMk0N
WCnugpd30d0YzxtI2PA29cNB2pyuGbaVg+zGqpsfAznaBHvnnEx1fJHNyfXxhAry
0MdabmbvhMfJPUYRFx/7r6Km8d52e+nv28pP/WrbWs4I0Swm+Rwaj3t32EgCBxQS
8WWEkG+L00slRgSPkfY8OgOM4QkBThHjGgw0TKFTEvQNVqXOJKQREq0MejyarUSC
4am+OJeRcWKtPcRo1jUlGWG6eun0ybuw232ZEZHUv33B247aRMuvTgcRTz3s6tUE
7RoeaMpl3/Y1MKtB2qURiu0Cib27Rl1mckhmfdA+awl3s4s=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
<AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.amazonaws.cn/saml"/>
<AttributeConsumingService index="1">
<ServiceName xml:lang="en">AWS Management Console Single Sign-On</ServiceName>
<RequestedAttribute isRequired="true" Name="https://aws.amazon.com/SAML/Attributes/Role" FriendlyName="RoleEntitlement"/>
<RequestedAttribute isRequired="true" Name="https://aws.amazon.com/SAML/Attributes/RoleSessionName" FriendlyName="RoleSessionName"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" FriendlyName="eduPersonAffiliation"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" FriendlyName="eduPersonNickname"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" FriendlyName="eduPersonOrgDN"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" FriendlyName="eduPersonOrgUnitDN"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" FriendlyName="eduPersonPrimaryAffiliation"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" FriendlyName="eduPersonEntitlement"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" FriendlyName="eduPersonScopedAffiliation"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" FriendlyName="eduPersonTargetedID"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" FriendlyName="eduPersonAssurance"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.2" FriendlyName="eduOrgHomePageURI"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.3" FriendlyName="eduOrgIdentityAuthNPolicyURI"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" FriendlyName="eduOrgLegalName"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.5" FriendlyName="eduOrgSuperiorURI"/>
<RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.6" FriendlyName="eduOrgWhitePagesURI"/>
<RequestedAttribute isRequired="false" Name="urn:oid:2.5.4.3" FriendlyName="cn"/>
</AttributeConsumingService>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Amazon Web Services, Inc.</OrganizationName>
<OrganizationDisplayName xml:lang="en">AWS</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://aws.amazon.com</OrganizationURL>
</Organization>
</EntityDescriptor>

View File

@@ -1,60 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" ID="_1e55eaf7-5cb9-4601-b557-e322fdfb2baf" entityID="urn:federation:MicrosoftOnline">
<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
<SignedInfo>
<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<Reference URI="#_1e55eaf7-5cb9-4601-b557-e322fdfb2baf">
<Transforms>
<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
<Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</Transforms>
<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
<DigestValue>fA33hUaj24/8F8bArDIkH6CpX0k=</DigestValue>
</Reference>
</SignedInfo>
<SignatureValue>p/rlVWxLRIYiHozzWUgsjmQ5ItMZ/ITeEOg/edeo50l7qU8wLM9JD55EHoLpVvxImBcCfY1CxKdq3s1o9Up1jvEcH9KjfYZea1q8hzTkQdt7F2XvxoqDFRLvVwyHHJjygaEvFRXXxml7IDgDx9ScSRhQeGUlTGhI9eAFSaGkChM/FPnmekZ3ngSwbVf4FsTLIArxMqEnV0lXNMTr5NHQ6VL5wZ/cHLNCkkBoY0qWyv2hnYiZiXa4TKjpAN+8QF5GDPv/0ExJwe+aoRAQhdBzhBUICQdQd+v3Rb5SuX++iVfmf4IPMqj8CK4uK7iYXNLCGEO8oFR2KlK/zBpHzw6yCQ==</SignatureValue>
<KeyInfo>
<X509Data>
<X509Certificate>MIIC/TCCAeWgAwIBAgIQF9xAVqfHt7dNSOnsMKYLDjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMTkwNjE4MDAwMDAwWhcNMjEwNjE4MDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLwL+mOk+zhgjHPFiZuDaU7coCOMkYyJyWS2B2KWYx7BMmy+SBSlFvvDHIiMXeLnv9DiUnQXtjClZXNqEo2amM/KdXfnCUlwdnqGa89TbB8kM6aBQKCh5Up7vejD+KRpPcOK7DqxWnm037zNKH+6liwRMUD/+lkBODoG1/ThuBVM0Kr1Oowfnkb4JYeF5xZk+2+ThR2dcQzdsz8dBW1GpGopdoM5G1amVhoRPBeNlYUqf0JUPE36Dx0iCmeXX00HTR2gd+/DJFVe34l/VxL4cqufmRcqWHy7axonbpt8svjAervGgueF5W/BVGcO4eVwFzFfnAz7bSaH/zbsNnQkFtAgMBAAGjITAfMB0GA1UdDgQWBBQlxmu/Hj1qB2A306p0Sz9up711AjANBgkqhkiG9w0BAQsFAAOCAQEAEhb+i+J69DvzCTfmC0Mn+uSGzBaW0ksMZNjM8/p/RFueytNo8/DY6TUb9W8l/HSVON782iGG7hIsG68RUIZ5q+/WAB9iBvKkKv5aGZ0bK/eD5boHwBwMa3udTjU68Vkai0A7naISEh22h+lQPvKiftCEzK1x9j2FoAXEMhACnpTwRrrj3SsJXCsMaOKcVw7sCmM4/4wD5I1+dfMSe85rSEzzUCDcCMEg67sBKdO2CFK1GoH21ttrz1CV+xt8Pn9a488kgsp2ZyU+yixS59CrM7onEzt1R4miXWAJAtydNHAmmbgKrTxqf67fEXFcrlFAHexi6vvINZWZPD6+J+q6xg==</X509Certificate>
</X509Data>
</KeyInfo>
</Signature>
<SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<KeyDescriptor use="signing">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
<X509Certificate>MIIC/TCCAeWgAwIBAgIQF9xAVqfHt7dNSOnsMKYLDjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMTkwNjE4MDAwMDAwWhcNMjEwNjE4MDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLwL+mOk+zhgjHPFiZuDaU7coCOMkYyJyWS2B2KWYx7BMmy+SBSlFvvDHIiMXeLnv9DiUnQXtjClZXNqEo2amM/KdXfnCUlwdnqGa89TbB8kM6aBQKCh5Up7vejD+KRpPcOK7DqxWnm037zNKH+6liwRMUD/+lkBODoG1/ThuBVM0Kr1Oowfnkb4JYeF5xZk+2+ThR2dcQzdsz8dBW1GpGopdoM5G1amVhoRPBeNlYUqf0JUPE36Dx0iCmeXX00HTR2gd+/DJFVe34l/VxL4cqufmRcqWHy7axonbpt8svjAervGgueF5W/BVGcO4eVwFzFfnAz7bSaH/zbsNnQkFtAgMBAAGjITAfMB0GA1UdDgQWBBQlxmu/Hj1qB2A306p0Sz9up711AjANBgkqhkiG9w0BAQsFAAOCAQEAEhb+i+J69DvzCTfmC0Mn+uSGzBaW0ksMZNjM8/p/RFueytNo8/DY6TUb9W8l/HSVON782iGG7hIsG68RUIZ5q+/WAB9iBvKkKv5aGZ0bK/eD5boHwBwMa3udTjU68Vkai0A7naISEh22h+lQPvKiftCEzK1x9j2FoAXEMhACnpTwRrrj3SsJXCsMaOKcVw7sCmM4/4wD5I1+dfMSe85rSEzzUCDcCMEg67sBKdO2CFK1GoH21ttrz1CV+xt8Pn9a488kgsp2ZyU+yixS59CrM7onEzt1R4miXWAJAtydNHAmmbgKrTxqf67fEXFcrlFAHexi6vvINZWZPD6+J+q6xg==</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
<KeyDescriptor use="signing">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
<X509Certificate>MIIC/TCCAeWgAwIBAgIQbgDHfi3t1JNGVqwD5/7lmjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMjAxMjIxMDAwMDAwWhcNMjUxMjIxMDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFT0/0/2qQurnYa0LbJHF9YYozhEH6r9mCxVDBYbewSG4tGgrWpsewQ/96pcczGMQctMvU+h2eX38Hx/f9JAIDbuRQzQlsPhQS7DDZ6WlTXU+t8d/g2C7fpSoLs4KVdJih4xyjLUWj+BK/ijsRjBt4Riw9VbJH/DdWKyoSMbECEiE+s1RtLP/eYoMmNfxyQGqWirCNqVNBTlqzYQp4dgF0foYy4ktoxwmQOVoTcIMFYp1I4pFPI7CxuMLkfK0X7aTbM7YGphvMfJxJkjrQdyI7G5d1t4DNi3zkEbBT7FGAr6qPt3Kn9ralpqJKHdpEBA9N0vNwQo5XTYIhUbPQ16IRAgMBAAGjITAfMB0GA1UdDgQWBBRs7tPmfkksSr67KtElHjYZbeaCTjANBgkqhkiG9w0BAQsFAAOCAQEAJqwMZSjQJ36x+1sty6EeLKQLQewQwPaEC47Zut+8bXed6Q8jMZ0bfa/MM7XquEcabaMZLQuKLft44YXwXXQOfQrI2qjQr3eToJFlDT9hR0rfp9wQqttDxd6Aa6RWwDTgo5oKUQCTKLHhEy8uWzScK0eGt2d7TWTaDXjRSwNq6tM7fRhZs07tKBV3xfi9EQy/mlavAMFRBVm86NSo7AsOG1IOMq03U3ooCWAXh9PdvvHNfHhH19futAnC/HeOjwRF1Qc527aBMphYFQLdiThfmfmiE/AhQqCwZ2oE7uCJhBtR+Kb1ZGhjI35pHfsSqGiFa7Kr+5ave822PDcke89Mvg==</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
<KeyDescriptor use="signing">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
<X509Certificate>MIIC/TCCAeWgAwIBAgIQbgDHfi3t1JNGVqwD5/7lmjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMjAxMjIxMDAwMDAwWhcNMjUxMjIxMDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFT0/0/2qQurnYa0LbJHF9YYozhEH6r9mCxVDBYbewSG4tGgrWpsewQ/96pcczGMQctMvU+h2eX38Hx/f9JAIDbuRQzQlsPhQS7DDZ6WlTXU+t8d/g2C7fpSoLs4KVdJih4xyjLUWj+BK/ijsRjBt4Riw9VbJH/DdWKyoSMbECEiE+s1RtLP/eYoMmNfxyQGqWirCNqVNBTlqzYQp4dgF0foYy4ktoxwmQOVoTcIMFYp1I4pFPI7CxuMLkfK0X7aTbM7YGphvMfJxJkjrQdyI7G5d1t4DNi3zkEbBT7FGAr6qPt3Kn9ralpqJKHdpEBA9N0vNwQo5XTYIhUbPQ16IRAgMBAAGjITAfMB0GA1UdDgQWBBRs7tPmfkksSr67KtElHjYZbeaCTjANBgkqhkiG9w0BAQsFAAOCAQEAJqwMZSjQJ36x+1sty6EeLKQLQewQwPaEC47Zut+8bXed6Q8jMZ0bfa/MM7XquEcabaMZLQuKLft44YXwXXQOfQrI2qjQr3eToJFlDT9hR0rfp9wQqttDxd6Aa6RWwDTgo5oKUQCTKLHhEy8uWzScK0eGt2d7TWTaDXjRSwNq6tM7fRhZs07tKBV3xfi9EQy/mlavAMFRBVm86NSo7AsOG1IOMq03U3ooCWAXh9PdvvHNfHhH19futAnC/HeOjwRF1Qc527aBMphYFQLdiThfmfmiE/AhQqCwZ2oE7uCJhBtR+Kb1ZGhjI35pHfsSqGiFa7Kr+5ave822PDcke89Mvg==</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/login.srf"/>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/login.srf" index="0" isDefault="true"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.microsoftonline.com/login.srf" index="1"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.microsoftonline.com/login.srf" index="2"/>
</SPSSODescriptor>
<Extensions>
<alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
</Extensions>
</EntityDescriptor>

View File

@@ -1,25 +0,0 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="google.com" validUntil="2021-06-02T00:00:00Z">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
<AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.google.com/a/yunion-hk.com/acs"/>
<AttributeConsumingService index="1">
<RequestedAttribute isRequired="false" Name="user.email" FriendlyName="user.email"/>
</AttributeConsumingService>
</SPSSODescriptor>
</EntityDescriptor>

View File

@@ -1,25 +0,0 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="google.com/a/yunion-hk.com" validUntil="2021-06-02T00:00:00Z">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
<AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.google.com/a/yunion-hk.com/acs"/>
<AttributeConsumingService index="1">
<RequestedAttribute isRequired="false" Name="user.email" FriendlyName="user.email"/>
</AttributeConsumingService>
</SPSSODescriptor>
</EntityDescriptor>

View File

@@ -1,79 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="M349b8f2417d474387360e922ef39baa" entityID="https://auth.huaweicloud.com/"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><ds:Reference URI="#M349b8f2417d474387360e922ef39baa"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>diBMwyuN633Q/kBf0M+SQZ4fNCI=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>k6+6QX8T5+S5wEIWlxwvd5a48xLWmp4Jd0bcs33vNaQVQ93YiztGcroUUqnLYK8uqAsmk2ZP4NtKFL/MyqoznrStglSi7uycwX6X3fswMwvkHJ9UVhH6Gp2Txl2JQ9/0vXy/tlXjQNFbfqzLhqxKC/K/PmKd684XkPYXlkiEJa6nGibu0gse9rvP2hE0G9bDMfdiyQnanfBvN+oNRte3xyI3DWh2P/jDTAPJMYzGM76JIneS8jLPa4gKDz5KcumG/8JV7GUWTDTZZ4ftujsjEuUFdPzKqwMYogMXOnTt8wbisSF8ZlLSMH/TIj6xAO9aSkEAo8HtlHJbekYlVA5Tz5IamLLzfaPpf7+NghLSuATIwY8/pvBZ8qhY8PVOjzRCeoEZJUrlFOcZ2CvO9zVKYdkEa1JC3mUW7CgeQc7G2/9niub7Vu00eyp9AAd9nkPfLoiWam8/yg2TBPRRJ9VKsv2UMFuITWrcFJayjezlTzY3dI3tI8lfoIMEVRaEP1v1D8XbxnxiaiKZXsGQHtpTSLc1ZL441jeZDLa661raUJDlGA6mBc1QukJklEocGg+Q+FeU33MJCaN/rIZCGvrjIZNng3yKFw1+R7/CqeJJlFWw0hPJQGiy6wfrDYSmhwuXJ2vQn3dTHjlT3kWsniiZtuOUi2TjHbq8gVHqlxmPxSs=</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIF6TCCA9GgAwIBAgIEPHSCijANBgkqhkiG9w0BAQsFADCBpDELMAkGA1UEBhMCQ04xEjAQBgNV
BAgTCUd1YW5nRG9uZzERMA8GA1UEBxMIU2hlblpoZW4xJTAjBgNVBAoTHEh1YXdlaSBUZWNobm9s
b2dpZXMgQ28uLCBMdGQxKDAmBgNVBAsTH1NlcnZpY2UgUHJvdmlkZXIgT3BlcmF0aW9uIERlcHQx
HTAbBgNVBAMTFGF1dGguaHVhd2VpY2xvdWQuY29tMB4XDTE4MDYyMTEzMjUwMFoXDTI4MDYxODEz
MjUwMFowgaQxCzAJBgNVBAYTAkNOMRIwEAYDVQQIEwlHdWFuZ0RvbmcxETAPBgNVBAcTCFNoZW5a
aGVuMSUwIwYDVQQKExxIdWF3ZWkgVGVjaG5vbG9naWVzIENvLiwgTHRkMSgwJgYDVQQLEx9TZXJ2
aWNlIFByb3ZpZGVyIE9wZXJhdGlvbiBEZXB0MR0wGwYDVQQDExRhdXRoLmh1YXdlaWNsb3VkLmNv
bTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJisHObeLOPs2mJ4eJBcruMZl9FjvRQe
DmofxgOcIcmybt6qlDqAv7275JMMQfQFcEoxH3GqcCTYqvSaSnHPaJB1xljPIKAWtd7p1ymevcSy
F2HdCZ8gPJKg3Q6+ZjwTipKS/nZr7xmpUQ0WvwRkgZ7zfslAW+y5PCgkDrgmEjG92rLArj8iPhmu
jajXaTPQKVHuZMxBzS735uo4yjVwYE3+0mE4HTZjK+6n6Ffu+JhLzhcKGulmrT/6qHisMbIXAZyE
egBDavomb+5zu/CUQwii5IAPrRTwwegYpG4+uYJ2cHfrUdHqw9lSCSbQzu1yW1AS4zB16sjoHZdV
rxYyktlswNmJ1/MyRH5bO90e2kvVwV4l34Hi5HEFvFFjL8TAsbN4mGvA9fgohXp30x97UdPVV8Ji
NNAKZjdZSEdG9xqrTRfe4+LQg/hzLNSwsko3nDnH8qhCgtb8qIipQ3s7niCa53AQWYR82lEViols
/dbWU9qYeldVvGNAgJSqHLB7qLwcQW78+2V1446KhQqzqPeLI4ANGaLFKw8fGzgh85RKOjrIetb4
wAOZmhrrUJrRg47DYQQjNv3glDg53ijLPFunzRqUoqLphrZ1XpEA4y21OtTP6OMYAM0lSOj1gjvb
ubTDo8XOQs5YGtTOyHn4CQ4GR8NNo7UrwVEmoZHA+AKbAgMBAAGjITAfMB0GA1UdDgQWBBTt05QW
9dyXi7eMekKOH0bn4xKrkDANBgkqhkiG9w0BAQsFAAOCAgEACv9zgzUgxxQ8t9ldOXmirxzSOrHx
MCL8SKsu+c+Y4hoHma5LFjylv6x76NWTAFSE6GgqfuNI/gPj/2AWqObAvsHd8lsPjJ96ZoSaTmS8
NrtU6HuT1Lc+CmVfeGd3/G+KspQECjg2JeBrfyEw9B8KUAQV20DQukGfAHtKKQPOZmKm0Qm3ExWC
eXz1TR2KP+Lrhny/yG43g4iVUKq65HFHs5cRzRk0iR0/NLpggl5+Op0rxMxBn+bCrnJBi0n9/PIM
fWNhkEBl+B++EifPUQxQaOEsnxTgFo1O4ksK9hDFcLbr+1qCDgVIMkyC1xMBBikCgLvIdzy3SXBN
ndIEUq+QgOORxLlq1WqrfLFO22TxZm8XaB5g36UMk5PGoVHGnjALReAHjC0C5sIiKMJSgQOPd71X
mQSsw3G9NsMKf/H3xJXkq/b672ls/l1JBslm52DAk2k5UlLkf/1p4I7WHOfm5ZNpDjj1rTP6SiAc
tWLtqXIU28fLa2sA+zHXA5acDGOm6eIrMme5HpsV/KoUOW1MXGugK59zofeueCFDGRfbyoS2lj0S
W+CbJVa72CLf3xPh2nWH0cK9de+wyCx8uI0KGPyV4I9/XBLHhvkb3XPaUfnkzYkcrG/39cOaxuPF
z+haXwI1lvI964zvmTgwdDjdf/0asA09S7EEK2KyzXUREM4=</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor use="signing"><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>MIIF6TCCA9GgAwIBAgIEPHSCijANBgkqhkiG9w0BAQsFADCBpDELMAkGA1UEBhMCQ04xEjAQBgNV
BAgTCUd1YW5nRG9uZzERMA8GA1UEBxMIU2hlblpoZW4xJTAjBgNVBAoTHEh1YXdlaSBUZWNobm9s
b2dpZXMgQ28uLCBMdGQxKDAmBgNVBAsTH1NlcnZpY2UgUHJvdmlkZXIgT3BlcmF0aW9uIERlcHQx
HTAbBgNVBAMTFGF1dGguaHVhd2VpY2xvdWQuY29tMB4XDTE4MDYyMTEzMjUwMFoXDTI4MDYxODEz
MjUwMFowgaQxCzAJBgNVBAYTAkNOMRIwEAYDVQQIEwlHdWFuZ0RvbmcxETAPBgNVBAcTCFNoZW5a
aGVuMSUwIwYDVQQKExxIdWF3ZWkgVGVjaG5vbG9naWVzIENvLiwgTHRkMSgwJgYDVQQLEx9TZXJ2
aWNlIFByb3ZpZGVyIE9wZXJhdGlvbiBEZXB0MR0wGwYDVQQDExRhdXRoLmh1YXdlaWNsb3VkLmNv
bTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJisHObeLOPs2mJ4eJBcruMZl9FjvRQe
DmofxgOcIcmybt6qlDqAv7275JMMQfQFcEoxH3GqcCTYqvSaSnHPaJB1xljPIKAWtd7p1ymevcSy
F2HdCZ8gPJKg3Q6+ZjwTipKS/nZr7xmpUQ0WvwRkgZ7zfslAW+y5PCgkDrgmEjG92rLArj8iPhmu
jajXaTPQKVHuZMxBzS735uo4yjVwYE3+0mE4HTZjK+6n6Ffu+JhLzhcKGulmrT/6qHisMbIXAZyE
egBDavomb+5zu/CUQwii5IAPrRTwwegYpG4+uYJ2cHfrUdHqw9lSCSbQzu1yW1AS4zB16sjoHZdV
rxYyktlswNmJ1/MyRH5bO90e2kvVwV4l34Hi5HEFvFFjL8TAsbN4mGvA9fgohXp30x97UdPVV8Ji
NNAKZjdZSEdG9xqrTRfe4+LQg/hzLNSwsko3nDnH8qhCgtb8qIipQ3s7niCa53AQWYR82lEViols
/dbWU9qYeldVvGNAgJSqHLB7qLwcQW78+2V1446KhQqzqPeLI4ANGaLFKw8fGzgh85RKOjrIetb4
wAOZmhrrUJrRg47DYQQjNv3glDg53ijLPFunzRqUoqLphrZ1XpEA4y21OtTP6OMYAM0lSOj1gjvb
ubTDo8XOQs5YGtTOyHn4CQ4GR8NNo7UrwVEmoZHA+AKbAgMBAAGjITAfMB0GA1UdDgQWBBTt05QW
9dyXi7eMekKOH0bn4xKrkDANBgkqhkiG9w0BAQsFAAOCAgEACv9zgzUgxxQ8t9ldOXmirxzSOrHx
MCL8SKsu+c+Y4hoHma5LFjylv6x76NWTAFSE6GgqfuNI/gPj/2AWqObAvsHd8lsPjJ96ZoSaTmS8
NrtU6HuT1Lc+CmVfeGd3/G+KspQECjg2JeBrfyEw9B8KUAQV20DQukGfAHtKKQPOZmKm0Qm3ExWC
eXz1TR2KP+Lrhny/yG43g4iVUKq65HFHs5cRzRk0iR0/NLpggl5+Op0rxMxBn+bCrnJBi0n9/PIM
fWNhkEBl+B++EifPUQxQaOEsnxTgFo1O4ksK9hDFcLbr+1qCDgVIMkyC1xMBBikCgLvIdzy3SXBN
ndIEUq+QgOORxLlq1WqrfLFO22TxZm8XaB5g36UMk5PGoVHGnjALReAHjC0C5sIiKMJSgQOPd71X
mQSsw3G9NsMKf/H3xJXkq/b672ls/l1JBslm52DAk2k5UlLkf/1p4I7WHOfm5ZNpDjj1rTP6SiAc
tWLtqXIU28fLa2sA+zHXA5acDGOm6eIrMme5HpsV/KoUOW1MXGugK59zofeueCFDGRfbyoS2lj0S
W+CbJVa72CLf3xPh2nWH0cK9de+wyCx8uI0KGPyV4I9/XBLHhvkb3XPaUfnkzYkcrG/39cOaxuPF
z+haXwI1lvI964zvmTgwdDjdf/0asA09S7EEK2KyzXUREM4=</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:KeyDescriptor use="encryption"><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>MIIF6TCCA9GgAwIBAgIEPHSCijANBgkqhkiG9w0BAQsFADCBpDELMAkGA1UEBhMCQ04xEjAQBgNV
BAgTCUd1YW5nRG9uZzERMA8GA1UEBxMIU2hlblpoZW4xJTAjBgNVBAoTHEh1YXdlaSBUZWNobm9s
b2dpZXMgQ28uLCBMdGQxKDAmBgNVBAsTH1NlcnZpY2UgUHJvdmlkZXIgT3BlcmF0aW9uIERlcHQx
HTAbBgNVBAMTFGF1dGguaHVhd2VpY2xvdWQuY29tMB4XDTE4MDYyMTEzMjUwMFoXDTI4MDYxODEz
MjUwMFowgaQxCzAJBgNVBAYTAkNOMRIwEAYDVQQIEwlHdWFuZ0RvbmcxETAPBgNVBAcTCFNoZW5a
aGVuMSUwIwYDVQQKExxIdWF3ZWkgVGVjaG5vbG9naWVzIENvLiwgTHRkMSgwJgYDVQQLEx9TZXJ2
aWNlIFByb3ZpZGVyIE9wZXJhdGlvbiBEZXB0MR0wGwYDVQQDExRhdXRoLmh1YXdlaWNsb3VkLmNv
bTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJisHObeLOPs2mJ4eJBcruMZl9FjvRQe
DmofxgOcIcmybt6qlDqAv7275JMMQfQFcEoxH3GqcCTYqvSaSnHPaJB1xljPIKAWtd7p1ymevcSy
F2HdCZ8gPJKg3Q6+ZjwTipKS/nZr7xmpUQ0WvwRkgZ7zfslAW+y5PCgkDrgmEjG92rLArj8iPhmu
jajXaTPQKVHuZMxBzS735uo4yjVwYE3+0mE4HTZjK+6n6Ffu+JhLzhcKGulmrT/6qHisMbIXAZyE
egBDavomb+5zu/CUQwii5IAPrRTwwegYpG4+uYJ2cHfrUdHqw9lSCSbQzu1yW1AS4zB16sjoHZdV
rxYyktlswNmJ1/MyRH5bO90e2kvVwV4l34Hi5HEFvFFjL8TAsbN4mGvA9fgohXp30x97UdPVV8Ji
NNAKZjdZSEdG9xqrTRfe4+LQg/hzLNSwsko3nDnH8qhCgtb8qIipQ3s7niCa53AQWYR82lEViols
/dbWU9qYeldVvGNAgJSqHLB7qLwcQW78+2V1446KhQqzqPeLI4ANGaLFKw8fGzgh85RKOjrIetb4
wAOZmhrrUJrRg47DYQQjNv3glDg53ijLPFunzRqUoqLphrZ1XpEA4y21OtTP6OMYAM0lSOj1gjvb
ubTDo8XOQs5YGtTOyHn4CQ4GR8NNo7UrwVEmoZHA+AKbAgMBAAGjITAfMB0GA1UdDgQWBBTt05QW
9dyXi7eMekKOH0bn4xKrkDANBgkqhkiG9w0BAQsFAAOCAgEACv9zgzUgxxQ8t9ldOXmirxzSOrHx
MCL8SKsu+c+Y4hoHma5LFjylv6x76NWTAFSE6GgqfuNI/gPj/2AWqObAvsHd8lsPjJ96ZoSaTmS8
NrtU6HuT1Lc+CmVfeGd3/G+KspQECjg2JeBrfyEw9B8KUAQV20DQukGfAHtKKQPOZmKm0Qm3ExWC
eXz1TR2KP+Lrhny/yG43g4iVUKq65HFHs5cRzRk0iR0/NLpggl5+Op0rxMxBn+bCrnJBi0n9/PIM
fWNhkEBl+B++EifPUQxQaOEsnxTgFo1O4ksK9hDFcLbr+1qCDgVIMkyC1xMBBikCgLvIdzy3SXBN
ndIEUq+QgOORxLlq1WqrfLFO22TxZm8XaB5g36UMk5PGoVHGnjALReAHjC0C5sIiKMJSgQOPd71X
mQSsw3G9NsMKf/H3xJXkq/b672ls/l1JBslm52DAk2k5UlLkf/1p4I7WHOfm5ZNpDjj1rTP6SiAc
tWLtqXIU28fLa2sA+zHXA5acDGOm6eIrMme5HpsV/KoUOW1MXGugK59zofeueCFDGRfbyoS2lj0S
W+CbJVa72CLf3xPh2nWH0cK9de+wyCx8uI0KGPyV4I9/XBLHhvkb3XPaUfnkzYkcrG/39cOaxuPF
z+haXwI1lvI964zvmTgwdDjdf/0asA09S7EEK2KyzXUREM4=</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.huaweicloud.com/authui/saml/SAMLAssertionConsumer" index="0" isDefault="true" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.huaweicloud.com/authui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://auth.huaweicloud.com/authui/saml/LogoutServiceHTTPRedirectResponse" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.huaweicloud.com/authui/saml/LogoutServiceHTTPPost" ResponseLocation="https://auth.huaweicloud.com/authui/saml/LogoutServiceHTTPPostResponse" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/><md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.huaweicloud.com/authui/saml/ManageNameIDServiceHTTPPost" ResponseLocation="https://auth.huaweicloud.com/authui/saml/ManageNameIDServiceHTTPPostResponse"/><md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.huaweicloud.com/authui/saml/ManageNameIDServiceHTTPRedirect" ResponseLocation="https://auth.huaweicloud.com/authui/saml/ManageNameIDServiceHTTPRedirectResponse"/><md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.huaweicloud.com/authui/saml/ManageNameIDServiceSOAP" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/><md:NameIDFormat xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat><md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.huaweicloud.com/authui/saml/SAMLAssertionConsumer" index="0" isDefault="true" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/></md:SPSSODescriptor></md:EntityDescriptor>

View File

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml="urn:oasis:names:tc:SAML:2.0:AssertionConsumerService" entityID="cloud.tencent.com" validUntil="2059-08-15T06:24:31Z">
<SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIEWzCCA0OgAwIBAgIJAP2Wa/iz6Zn+MA0GCSqGSIb3DQEBBQUAMIHDMQswCQYDVQQGEwJDTjESMBAGA1UECAwJZ3Vhbmdkb25nMREwDwYDVQQHDAhzaGVuemhlbjE2MDQGA1UECgwtVGVuY2VudCBUZWNobm9sb2d5IChTaGVuemhlbikgQ29tcGFueSBMaW1pdGVkMRYwFAYDVQQLDA1UZW5jZW50IENsb3VkMRowGAYDVQQDDBFjbG91ZC50ZW5jZW50LmNvbTEhMB8GCSqGSIb3DQEJARYScWNsb3VkQHRlbmNlbnQuY29tMB4XDTE4MDgxNTA2MjQzMVoXDTE5MDgxNTA2MjQzMVowgcMxCzAJBgNVBAYTAkNOMRIwEAYDVQQIDAlndWFuZ2RvbmcxETAPBgNVBAcMCHNoZW56aGVuMTYwNAYDVQQKDC1UZW5jZW50IFRlY2hub2xvZ3kgKFNoZW56aGVuKSBDb21wYW55IExpbWl0ZWQxFjAUBgNVBAsMDVRlbmNlbnQgQ2xvdWQxGjAYBgNVBAMMEWNsb3VkLnRlbmNlbnQuY29tMSEwHwYJKoZIhvcNAQkBFhJxY2xvdWRAdGVuY2VudC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7z2KMtR6GS4IzwfFYLSULCrKrr6iUVRlxUhn0y/CjpWXGg31nwvXYmJZaCwjUlorTd3pYDmStmd4xoL3xrGFnqX0xqKw7S+vbB9wo5tSHww15vkiYPanjsgeaiXihBBB6jvsV8+4iuVk8JA3x990/0wic/ZuKIhCI4mLCaQYLXbsYopUPQ5p+dwkCY9pYxP+zjOQathA0cjzKyzp9io2pcH2vtj7RzM+j4sLTsTC+OGfh7k9LQO5/fswQTQKr1B4tmtI8Cq7pUP0Fud1YLjMpod/NRVv1/xIF6cJFP8QARfmC45FPjHToORiXVUV8hii8l4EkXw2bAQO+wqodXJaZAgMBAAGjUDBOMB0GA1UdDgQWBBQ6e8nFUT7oKF+LbOYFH200WR5I0zAfBgNVHSMEGDAWgBQ6e8nFUT7oKF+LbOYFH200WR5I0zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBAIaZDjgCLkWq6fFpp/ViwdEBtLbKNNx2K28z91kTZNE+lepYagqWQIPpTGo69GmO9Qdf/mkspY3Y80Q3MpUO09V3gsiqXQBHD5ZfyRHwmqDjDudLA1SGzMjMT+48XuMq4fdonO1o5fyDh/My9w1LuRZzWw5ZE0JEpKgXq1ynQYz0uEip7KrUVUNoAS2n9jT8APfs16M4p5VRpIYlugnBwR9P2bZba+9fR/SPTa7FX4S8sU649wGPR+49uvic2kwc8FP6AXGurJZhd7mZ44j58q0M/LXm/6wiyUslZ/I0uGhxmRav0cTQz4T1dXKdh2pJZBwz8yMv2P6fuxcFlUeR6</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cloud.tencent.com/login/saml" index="1" isDefault="true"/>
<AttributeConsumingService index="1">
<ServiceName xml:lang="en"/>
<RequestedAttribute FriendlyName="RoleEntitlement" Name="https://cloud.tencent.com/SAML/Attributes/Role" isRequired="true"/>
<RequestedAttribute FriendlyName="RoleSessionName" Name="https://cloud.tencent.com/SAML/Attributes/RoleSessionName" isRequired="true"/>
</AttributeConsumingService>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Tencent Cloud Services, Inc.</OrganizationName>
<OrganizationDisplayName xml:lang="en">Tencent Cloud</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://cloud.tencent.com</OrganizationURL>
</Organization>
</EntityDescriptor>

View File

@@ -1,35 +0,0 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.volcengine.com/">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIDJjCCAg6gAwIBAgIUF3lH8/cdlQeyPBqt066RFnt3cI4wDQYJKoZIhvcNAQELBQAwJTEjMCEGA1UEAxMadXJuOnZvbGNlbmdpbmU6d2Vic2VydmljZXMwHhcNMjMwODA4MDIzNzI4WhcNMzMwODIxMTYwMDAwWjAlMSMwIQYDVQQDExp1cm46dm9sY2VuZ2luZTp3ZWJzZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPZ+nhODpFTe+A8PbuZYA5XDQ04WckV1A5U90tKaaUX5uKLUYfDtFA1TwMO/qG87LU/0Pxs4FhgZJkUOeBHkyYzzXZQvtfsJ9frcKkcTjX/WF4XJyitXCULSjhcclMS3gOqeI/Mo3P90KutfhNli/mAHQJaRsuPFG4ZwBusbUo8i5sqBqt/Sg8JapH7DjEU2mN1165o59gavPGSByPeEuu28EkivVFcI7Jox5ztwgMrOYY+pYP9GeSurzpyLq3CfvvahTsAJjuHDHTTnYNcq/I3VOap/y4cOU6vgxcQvBmgb+CBvGldjn0em3BIn5meQwuB6jfQ7kqBaO1PRD1nhDTMCAwEAAaNOMEwwSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzABhi5odHRwOi8vbmV4dXMtcHJvZHVjdGlvbi5ieXRlZGFuY2UubmV0L3BjYS9vY3NwMA0GCSqGSIb3DQEBCwUAA4IBAQBxySDr9TPJxRN+otrFDaV8HSeFKUUSO3+r8bEVAXmS+xUsdUOZbaf2r/g+eKrW58dpn+iBWTAAKug9Jwe5KVGqB7G5r2r6k/eI5dvv5r/Fr5T7NppRCXKQTQiAhrrVlqttsagPztJ6LmVAcm4sh4Ckx99FgibQCbT/zui+c6IUyEQcVIwtmoPANl3K2Yn85t+G+Cu9xxXY0JPlZcUHntHg0R0PUWc3LuzLXnff7JWEzPyhMUBLpQk5BltxuD5cTGCA6WafJuBTAqkt48VN0MFTP5c5m3PJFz8Ro1GLY8hw1uhUEx28DKBkQSGpkZNx0oJXETIDpSBfD0dHWBvZQPd0</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
<AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.volcengine.com/saml/sso"/>
<AttributeConsumingService index="1">
<ServiceName xml:lang="en">Volcengine Single Sign-On</ServiceName>
<RequestedAttribute isRequired="true" Name="https://www.volcengine.com/SAML/Attributes/Identity" FriendlyName="Identity"/>
<RequestedAttribute isRequired="true" Name="https://www.volcengine.com/SAML/Attributes/SessionName" FriendlyName="SessionName"/>
<RequestedAttribute isRequired="false" Name="https://www.volcengine.com/SAML/Attributes/SessionDuration" FriendlyName="SessionDuration"/>
</AttributeConsumingService>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Volcengine, Inc.</OrganizationName>
<OrganizationDisplayName xml:lang="en">Volcengine</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://www.volcengine.com</OrganizationURL>
</Organization>
</EntityDescriptor>

View File

@@ -1 +0,0 @@
DESCRIPTION="Yunion CloudId"

View File

@@ -1,10 +0,0 @@
region = 'Yunion'
address = '10.168.222.136'
port = 8891
auth_uri = 'http://10.168.222.136:35357/v3'
admin_user = 'cloudnetadmin'
admin_password = 'xxxxxxxxxxxxxxxx'
admin_tenant_name = 'system'
sql_connection = 'mysql+pymysql://yunionansible:9YuQL9KEZn1mppaK@localhost:3306/yunionansible?charset=utf8'
auto_sync_table = True

View File

@@ -1 +0,0 @@
DESCRIPTION="Yunion Cloudnet"

View File

@@ -1,23 +0,0 @@
#!/bin/bash
set -e
if [ -z "$ROOT_DIR" ]; then
ROOT_DIR=$(dirname $(dirname $(readlink -f "$BASH_SOURCE")))
fi
RPMS_DIR=$ROOT_DIR/_output/rpms
DEBS_DIR=$ROOT_DIR/_output/debs
case $(uname -m) in
x86_64)
CURRENT_ARCH=amd64
;;
aarch64)
CURRENT_ARCH=arm64
;;
esac
mkdir -p $DEBS_DIR && cd $DEBS_DIR
find $RPMS_DIR -type f -name *.rpm -exec alien --target=$CURRENT_ARCH {} \;

View File

@@ -1 +0,0 @@
DESCRIPTION="Yunion DevTools Server"

View File

@@ -1,3 +0,0 @@
INTERFACE=""
INTERFACE_IP=""
RELAY=""

View File

@@ -1,22 +0,0 @@
[Unit]
Description=Yunion Cloud DHCP Relay Agent
Documentation=https://docs.yunion.cn
After=network-online.target
Wants=network-online.target
After=network.target
[Service]
Type=simple
EnvironmentFile=-/etc/sysconfig/yunion_dhcprelay
User=root
Group=root
ExecStart=/opt/yunion/bin/dhcprelay --interface "$INTERFACE" --ip "$IP" --relay "$RELAY"
WorkingDirectory=/opt/yunion/bin
KillMode=process
Restart=always
RestartSec=30
LimitNOFILE=500000
LimitNPROC=500000
[Install]
WantedBy=multi-user.target

View File

@@ -1,2 +0,0 @@
DESCRIPTION="Yunion Tiny DHCP Relay Server"
SERVICE="yes"

View File

@@ -1,3 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/aiproxy /opt/yunion/bin/aiproxy

View File

@@ -1,8 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:3.22.2-0
# https://github.com/yunionio/telegraf/blob/yn-release-1.36/Makefile.yn#L28
# install playbook and telegraf install pkg
COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.5 /opt/yunion/playbook /opt/yunion/playbook
COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.5 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver

View File

@@ -1,31 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
LABEL maintainer="Yousong Zhou <zhouyousong@yunionyun.com>"
ENV TZ="UTC"
RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
# openssh-client, for ansible ssh connection
# git, ca-certificates, for fetching ansible roles
RUN set -x \
&& apk update \
&& apk add openssh-client \
&& apk add sshpass \
&& apk add py3-pip \
&& apk add py3-paramiko \
&& apk add tzdata git ca-certificates
RUN apk add --no-cache openssh openssl curl rsync pv mariadb-client
RUN apk add --no-cache --virtual .build-dependencies \
libffi-dev openssl-dev python3-dev build-base py-setuptools rust cargo mariadb-dev
# ansible should be installed
# after setuptools and wheel
RUN rm /usr/lib/python3.*/EXTERNALLY-MANAGED
RUN pip3 install -U pip setuptools wheel \
&& pip3 install mysqlclient pywinrm \
&& pip3 install 'ansible<=9.0.0' \
&& apk del --no-network .build-dependencies \
&& rm -rf /root/.cache /root/.cargo /var/cache/apk/*

View File

@@ -1,3 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/apigateway /opt/yunion/bin/apigateway

View File

@@ -1,3 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/apimap /opt/yunion/bin/apimap

View File

@@ -1,8 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.9-20260724.0
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
RUN mkdir -p /opt/yunion/bin
ENV TZ="UTC"
ADD ./_output/alpine-build/bin/baremetal-agent /opt/yunion/bin/baremetal-agent

View File

@@ -1,89 +0,0 @@
#RUN yum install -y https://iso.yunion.cn/vm-images/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
#RUN yum install -y http://192.168.23.50:8083/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
FROM registry.cn-beijing.aliyuncs.com/yunionio/yunionos:v4.0.0-20251203.0 as yunionos
FROM registry.cn-beijing.aliyuncs.com/cloudpods/centos:8 as grub-stage
RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
RUN dnf install -y grub2*
# make grub_booti386 firmware
RUN grub2-mkimage -d /usr/lib/grub/i386-pc/ -O i386-pc-pxe -o /root/grub_booti386 -p '/grub' pxe tftp boot linux ext2 xfs ntfs fat part_msdos part_gpt normal biosdisk
# make grub_bootx64 firmware
RUN grub2-mkimage -d /usr/lib/grub/x86_64-efi/ -O x86_64-efi -o /root/grub_bootx64.efi -p '/grub' efinet tftp boot linux ext2 xfs ntfs fat part_msdos part_gpt normal efi_gop
# make grub_arm64 firmware
RUN grub2-mkimage -d /usr/lib/grub/arm64-efi/ -O arm64-efi -o /root/grub_arm64.efi -p '/grub' efinet tftp boot linux ext2 xfs ntfs fat part_msdos part_gpt normal efi_gop
RUN mkdir -p /tftp/grub
RUN cp /root/grub_booti386 /tftp
RUN cp -rf /usr/lib/grub/i386-pc /tftp/grub
RUN cp /root/grub_bootx64.efi /tftp
RUN cp -rf /usr/lib/grub/x86_64-efi /tftp/grub
RUN cp /root/grub_arm64.efi /tftp
RUN cp -rf /usr/lib/grub/arm64-efi /tftp/grub
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
LABEL maintainer="Zexi Li <zexi.li@icloud.com>"
RUN mkdir -p /opt/yunion/bin
RUN apk update && \
apk add --no-cache ipmitool ethtool tzdata ca-certificates cdrkit coreutils librados librbd && \
rm -rf /var/cache/apk/*
RUN mkdir -p /opt/cloud/yunion/baremetal
# udpate latest pci.ids
RUN wget -O /opt/cloud/yunion/baremetal/pci.ids http://pci-ids.ucw.cz/v2.2/pci.ids
# download baremetal-pxerom-*.x86_64.rpm and unpack rpm in current directory
#COPY --from=build /opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
#COPY --from=build /opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
#COPY --from=build /opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal
# copy grub file
COPY --from=grub-stage /tftp/grub_booti386 /opt/cloud/yunion/baremetal
COPY --from=grub-stage /tftp/grub_bootx64.efi /opt/cloud/yunion/baremetal
COPY --from=grub-stage /tftp/grub_arm64.efi /opt/cloud/yunion/baremetal
COPY --from=grub-stage /tftp/grub /opt/cloud/yunion/baremetal/grub
# copy boot files from yunionos
COPY --from=yunionos /yunionos/x86_64/kernel /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/initramfs /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/aarch64/kernel /opt/cloud/yunion/baremetal/kernel_aarch64
COPY --from=yunionos /yunionos/aarch64/initramfs /opt/cloud/yunion/baremetal/initramfs_aarch64
COPY --from=yunionos /yunionos/riscv64/kernel /opt/cloud/yunion/baremetal/kernel_riscv64
COPY --from=yunionos /yunionos/riscv64/initramfs /opt/cloud/yunion/baremetal/initramfs_riscv64
# TODO: syslinux firmwares should removed in future
COPY --from=yunionos /yunionos/x86_64/isolinux.bin /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/bootia32.efi /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/bootx64.efi /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/chain.c32 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/initramfs /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/kernel /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/ldlinux.c32 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/ldlinux.e32 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/ldlinux.e64 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/libcom32.c32 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/libutil.c32 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/lpxelinux.0 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/menu.c32 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/pxelinux.0 /opt/cloud/yunion/baremetal

View File

@@ -1,7 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:3.22.2-2
ADD ./build/climc/root/opt /opt
RUN cp /opt/yunion/scripts/motd/climc.sh /etc/profile.d/climc.sh && ln -sf /etc/profile.d/climc.sh /root/.bashrc
ADD ./_output/alpine-build/bin/climc ./_output/alpine-build/bin/*cli /opt/yunion/bin/

View File

@@ -1,24 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
ARG TARGETPLATFORM
ARG BUILDPLATFORM
ARG TARGETARCH
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
ENV TZ="Asia/Shanghai"
RUN mkdir -p /opt/yunion/bin
RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories
RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim ipmitool ceph-common dropbear shadow && \
rm -rf /var/cache/apk/*
RUN usermod --shell /bin/bash root
RUN curl https://iso.yunion.cn/binaries/kubernetes-release/release/v1.22.9/bin/linux/${TARGETARCH}/kubectl -o /usr/bin/kubectl && chmod a+x /usr/bin/kubectl
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN mkdir -p /opt/yunion/bin

View File

@@ -1,24 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ARG TARGETPLATFORM
ARG BUILDPLATFORM
ARG TARGETARCH
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
ENV TZ="Asia/Shanghai"
RUN mkdir -p /opt/yunion/bin
RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories
RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim ipmitool ceph-common dropbear shadow && \
rm -rf /var/cache/apk/*
RUN usermod --shell /bin/bash root
RUN curl -L https://iso.yunion.cn/binaries/kubernetes-release/release/v1.22.9/bin/linux/${TARGETARCH}/kubectl -o /usr/bin/kubectl && chmod a+x /usr/bin/kubectl
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN mkdir -p /opt/yunion/bin

View File

@@ -1,3 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/cloudevent /opt/yunion/bin/cloudevent

View File

@@ -1,4 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
COPY ./build/cloudid/root/opt/ /opt/
ADD ./_output/alpine-build/bin/cloudid /opt/yunion/bin/cloudid

View File

@@ -1,8 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
RUN mkdir -p /etc/yunion/data/
ADD ./_output/alpine-build/bin/cloudmon \
/opt/yunion/bin/

View File

@@ -1,3 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/cloudnet /opt/yunion/bin/cloudnet

View File

@@ -1,3 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/cloudproxy /opt/yunion/bin/cloudproxy

View File

@@ -1,9 +0,0 @@
# registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0
FROM debian:trixie
RUN apt update && apt install -y alien
RUN apt-get clean autoclean && \
apt-get autoremove --yes && \
rm -rf /var/lib/{apt,dpkg,cache,log}/

View File

@@ -1,3 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/devtool /opt/yunion/bin/devtool

Some files were not shown because too many files have changed in this diff Show More