Compare commits

..

656 Commits

Author SHA1 Message Date
yunion-ci-robot
4f2f9420c0 Merge pull request #2527 from ioito/automated-cherry-pick-of-#2522-upstream-release-2.8.0
Automated cherry pick of #2522: fix: sync status after guest sync conf
2019-08-23 18:04:09 +08:00
ioito
820c0f5ca9 fix: sync status after guest sync conf 2019-08-23 17:21:55 +08:00
yunion-ci-robot
866ff3dafd Merge pull request #2506 from ioito/automated-cherry-pick-of-#2499-upstream-release-2.8.0
Automated cherry pick of #2499: fix: qcloud sync unavailable storages
2019-08-23 10:56:08 +08:00
ioito
f5d1ad28ec fix: qcloud sync unavailable storages 2019-08-22 20:49:20 +08:00
yunion-ci-robot
a931461e73 Merge pull request #2482 from ioito/automated-cherry-pick-of-#2451-upstream-release-2.8.0
Automated cherry pick of #2451: bugfix: 避免openstack磁盘扩容成功后未能挂载到虚拟机上
2019-08-22 11:41:07 +08:00
ioito
c97dba35d4 bugfix: 避免openstack磁盘扩容成功后未能挂载到虚拟机上 2019-08-22 10:21:15 +08:00
yunion-ci-robot
8ff1eafe5b Merge pull request #2400 from ioito/automated-cherry-pick-of-#2381-upstream-release-2.8.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
c0d48b6114 fix: httputils show error when resp body is not dict 2019-08-20 10:20:46 +08:00
yunion-ci-robot
8596a4392f Merge pull request #2348 from yousong/automated-cherry-pick-of-#2343-upstream-release-2.8.0
Automated cherry pick of #2343: hostman: windows: 改正批处理代码
2019-08-17 09:58:06 +08:00
Yousong Zhou
df0056dfb2 hostman: windows: 改正批处理代码 2019-08-16 13:22:42 +00:00
yunion-ci-robot
8f02ead030 Merge pull request #2331 from ioito/automated-cherry-pick-of-#2326-upstream-release-2.8.0
Automated cherry pick of #2326: fix: azure快照的磁盘id应该小写
2019-08-16 16:27:04 +08:00
ioito
dd56d57747 fix: azure快照的磁盘id应该小写 2019-08-16 15:59:44 +08:00
yunion-ci-robot
b63e58cafb Merge pull request #2321 from ioito/automated-cherry-pick-of-#2316-upstream-release-2.8.0
Automated cherry pick of #2316: fix: create disk with project-src=local
2019-08-16 15:25:03 +08:00
ioito
fc2b29be70 fix: create disk with project-src=local 2019-08-16 15:08:23 +08:00
yunion-ci-robot
cc79e19d20 Merge pull request #2256 from wanyaoqi/automated-cherry-pick-of-#2250-upstream-release-2.8.0
Automated cherry pick of #2250: support get user tags
2019-08-13 18:55:03 +08:00
wanyaoqi
d79c3188d3 support get user tags 2019-08-13 18:45:03 +08:00
yunion-ci-robot
caccfd65d3 Merge pull request #2238 from ioito/automated-cherry-pick-of-#2234-upstream-release-2.8.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
ioito
05e9ece08c fix: no need to inject password by cloud-init for qcloud 2019-08-12 20:28:49 +08:00
yunion-ci-robot
22d6fff81c Merge pull request #2206 from ioito/automated-cherry-pick-of-#2202-upstream-release-2.8.0
Automated cherry pick of #2202: fix: sync cloud snapshot size
2019-08-12 11:51:01 +08:00
ioito
e17184b5fa fix: sync cloud snapshot size 2019-08-10 16:52:02 +08:00
yunion-ci-robot
18a76155be Merge pull request #2190 from ioito/automated-cherry-pick-of-#2186-upstream-release-2.8.0
Automated cherry pick of #2186: fix: lb purge error
2019-08-08 20:07:58 +08:00
ioito
83cf5b2e82 fix: lb purge error 2019-08-08 19:57:34 +08:00
yunion-ci-robot
90423effa4 Merge pull request #2185 from tb365/automated-cherry-pick-of-#2181-upstream-release-2.8.0
Automated cherry pick of #2181: cpu core bugfix
2019-08-08 19:50:59 +08:00
TangBin
638824c10b cpu core bugfix 2019-08-08 19:44:37 +08:00
yunion-ci-robot
a34546c1ec Merge pull request #2086 from ioito/automated-cherry-pick-of-#2082-upstream-release-2.8.0
Automated cherry pick of #2082: fix: get openstack all customize storage type
2019-08-02 20:17:03 +08:00
ioito
ed4a28b554 fix: get openstack all customize storage type 2019-08-02 20:11:41 +08:00
yunion-ci-robot
7b66a5f1ad Merge pull request #2054 from ioito/automated-cherry-pick-of-#2048-upstream-release-2.8.0
Automated cherry pick of #2048: fix: openstack glance image-list not list all images
2019-08-01 16:55:03 +08:00
ioito
aae57f78b1 fix: openstack glance image-list not list all images 2019-07-31 19:47:49 +08:00
yunion-ci-robot
500eedba38 Merge pull request #2023 from ioito/automated-cherry-pick-of-#1982-upstream-release-2.8.0
Automated cherry pick of #1982: fix: rbd image resize not found error
2019-07-31 15:55:00 +08:00
yunion-ci-robot
9d2dd183f5 Merge pull request #2047 from wanyaoqi/automated-cherry-pick-of-#2043-upstream-release-2.8.0
Automated cherry pick of #2043: guest export keys add zone
2019-07-31 15:51:01 +08:00
wanyaoqi
463f413f07 guest export keys add zone 2019-07-31 15:45:31 +08:00
ioito
756d152f4d fix: rbd image resize not found error 2019-07-30 19:11:48 +08:00
yunion-ci-robot
5340769a00 Merge pull request #2009 from ioito/automated-cherry-pick-of-#2005-upstream-release-2.8.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
57fa1ddb7b Merge pull request #1993 from ioito/automated-cherry-pick-of-#1989-upstream-release-2.8.0
Automated cherry pick of #1989: fix: qcloud reserved first, second and last ip for internal connection
2019-07-30 12:53:31 +08:00
ioito
c641beefa7 fix: add priority for openstack secgroup rule priority 2019-07-30 11:51:29 +08:00
ioito
beea0e478f fix: qcloud reserved first, second and last ip for internal connection 2019-07-29 20:04:45 +08:00
yunion-ci-robot
17e0c7e1ab Merge pull request #1914 from ioito/automated-cherry-pick-of-#1910-upstream-release-2.8.0
Automated cherry pick of #1910: fix: 避免镜像同步到私有云自定义镜像里面
2019-07-26 15:32:06 +08:00
ioito
f731ebc62f fix: 避免镜像同步到私有云自定义镜像里面 2019-07-25 14:41:38 +08:00
yunion-ci-robot
d136be7fcf Merge pull request #1866 from ioito/automated-cherry-pick-of-#1860-upstream-release-2.8.0
Automated cherry pick of #1860: 添加同步安全组日志
2019-07-24 09:36:07 +08:00
ioito
8c8f3427b1 避免重复设置同一vpc底下不同安全组externalId 2019-07-23 22:00:06 +08:00
ioito
127a671927 添加同步安全组日志 2019-07-23 21:55:48 +08:00
yunion-ci-robot
2e0e44f8bd Merge pull request #1849 from ioito/automated-cherry-pick-of-#1829-upstream-release-2.8.0
Automated cherry pick of #1829: 避免cacheimage refresh时同步azure镜像信息异常
2019-07-23 18:44:05 +08:00
ioito
34fb2c8ef8 避免cacheimage refresh时同步azure镜像信息异常 2019-07-23 15:07:13 +08:00
yunion-ci-robot
6d54a6d3c4 Merge pull request #1836 from ioito/automated-cherry-pick-of-#1832-upstream-release-2.8.0
Automated cherry pick of #1832: 避免因cloudprovider disable导致账号同步失效
2019-07-23 12:04:04 +08:00
yunion-ci-robot
ee9a503f9d Merge pull request #1828 from ioito/automated-cherry-pick-of-#1820-upstream-release-2.8.0
Automated cherry pick of #1820: 仅忽略 no such service错误,否则以最新api结果为准
2019-07-23 12:01:04 +08:00
ioito
9988e6c18d 避免因cloudprovider disable导致账号同步失效 2019-07-22 20:14:46 +08:00
ioito
6c6562f3b7 仅忽略 no such service错误,否则以最新api结果为准 2019-07-22 10:12:36 +08:00
yunion-ci-robot
4b30f07c59 Merge pull request #1804 from wanyaoqi/bugfix/wyq/fix-export-data-2.8
fix list export data no filed
2019-07-18 19:41:02 +08:00
wanyaoqi
4b747c75d7 fix list export data no filed 2019-07-18 19:35:25 +08:00
yunion-ci-robot
f539ba90fa Merge pull request #1800 from ioito/automated-cherry-pick-of-#1796-upstream-release-2.8.0
Automated cherry pick of #1796: 提高openstack创建windows机器成功率
2019-07-18 15:39:00 +08:00
ioito
1946d27f15 提高openstack创建windows机器成功率 2019-07-18 15:08:01 +08:00
yunion-ci-robot
ac8c898735 Merge pull request #1728 from ioito/automated-cherry-pick-of-#1724-upstream-release-2.8.0
Automated cherry pick of #1724: 修复purge backend野指针引用问题
2019-07-15 10:38:58 +08:00
ioito
311da29dd5 修复purge backend野指针引用问题 2019-07-15 10:25:32 +08:00
yunion-ci-robot
074eec803c Merge pull request #1713 from ioito/automated-cherry-pick-of-#1709-upstream-release-2.8.0
Automated cherry pick of #1709: fix console log
2019-07-13 17:39:59 +08:00
ioito
8543ac55f8 fix console log 2019-07-13 14:48:51 +08:00
yunion-ci-robot
a7a7654967 Merge pull request #1685 from ioito/automated-cherry-pick-of-#1681-upstream-release-2.8.0
Automated cherry pick of #1681: 宿主机存储利用率仅计算本地存储
2019-07-12 14:39:56 +08:00
yunion-ci-robot
7c596ff100 Merge pull request #1703 from ioito/automated-cherry-pick-of-#1699-upstream-release-2.8.0
Automated cherry pick of #1699: 同优先级规则deny优先于allow规则生效
2019-07-12 12:06:57 +08:00
ioito
a9b081ee3e 同优先级规则deny优先于allow规则生效 2019-07-12 11:57:29 +08:00
yunion-ci-robot
a171963ac1 Merge pull request #1680 from ioito/automated-cherry-pick-of-#1676-upstream-release-2.8.0
Automated cherry pick of #1676: 避免重装系统时绑定秘钥后没有account信息
2019-07-11 18:31:55 +08:00
ioito
5e1a094f19 宿主机存储利用率仅计算本地存储 2019-07-11 17:39:07 +08:00
ioito
0fd92435bd 避免重装系统时绑定秘钥后没有account信息 2019-07-11 17:01:39 +08:00
yunion-ci-robot
66aff0a9f5 Merge pull request #1668 from swordqiu/automated-cherry-pick-of-#1667-upstream-release-2.8.0
Automated cherry pick of #1667: fix: task usercred should be utf8 charset
2019-07-11 12:16:57 +08:00
Qiu Jian
10925671ee fix: backport variable name change 2019-07-11 12:10:19 +08:00
Qiu Jian
ab7fef6008 fix: task usercred should be utf8 charset 2019-07-11 12:08:48 +08:00
yunion-ci-robot
6a72d7a2e6 Merge pull request #1658 from ioito/automated-cherry-pick-of-#1654-upstream-release-2.8.0
Automated cherry pick of #1654: fix qcloud associate eip timeout after bind
2019-07-11 08:46:56 +08:00
ioito
116a37571d fix qcloud associate eip timeout after bind 2019-07-10 21:15:33 +08:00
yunion-ci-robot
9b251c87cc Merge pull request #1645 from ioito/automated-cherry-pick-of-#1641-upstream-release-2.8.0
Automated cherry pick of #1641: 统一处理ResourceNotFound返回id not find
2019-07-10 20:46:56 +08:00
ioito
3fa76f6c92 统一处理ResourceNotFound返回id not find 2019-07-10 16:13:18 +08:00
yunion-ci-robot
3638893459 Merge pull request #1630 from ioito/automated-cherry-pick-of-#1626-upstream-release-2.8.0
Automated cherry pick of #1626: metadata permission
2019-07-09 23:23:57 +08:00
yunion-ci-robot
7c4271fa84 Merge pull request #1634 from ioito/automated-cherry-pick-of-#1622-upstream-release-2.8.0
Automated cherry pick of #1622: 兼容zone及usable参数
2019-07-09 23:03:55 +08:00
ioito
2d55107e7f 兼容zone及usable参数 2019-07-09 22:47:28 +08:00
ioito
bd407dcebd metadata permission 2019-07-09 22:41:03 +08:00
yunion-ci-robot
be660f6bd7 Merge pull request #1609 from ioito/automated-cherry-pick-of-#1602-upstream-release-2.8.0
Automated cherry pick of #1602: add task failed code
2019-07-09 17:29:58 +08:00
yunion-ci-robot
508eef918e Merge pull request #1613 from ioito/automated-cherry-pick-of-#1605-upstream-release-2.8.0
Automated cherry pick of #1605: fix clone rbd image error
2019-07-09 17:22:58 +08:00
ioito
6fb5ebb703 fix clone rbd image error 2019-07-09 15:50:43 +08:00
ioito
9940399f23 add task failed code 2019-07-09 15:47:12 +08:00
Jian Qiu
fd195f953a fix: ignore queryField panic (#1583) 2019-07-06 11:07:39 +08:00
yunion-ci-robot
a9ab4151d2 Merge pull request #1577 from ioito/automated-cherry-pick-of-#1573-upstream-release-2.8.0
Automated cherry pick of #1573: add usable filter for network
2019-07-05 23:04:53 +08:00
yunion-ci-robot
030de54720 Merge pull request #1580 from ioito/automated-cherry-pick-of-#1551-upstream-release-2.8.0
Automated cherry pick of #1551: add without_user_meta filter
2019-07-05 22:47:54 +08:00
yunion-ci-robot
fadbdc0140 Merge pull request #1567 from ioito/automated-cherry-pick-of-#1563-upstream-release-2.8.0
Automated cherry pick of #1563: add deploy failed action log
2019-07-05 22:30:53 +08:00
yunion-ci-robot
c8f21e4099 Merge pull request #1558 from ioito/automated-cherry-pick-of-#1550-upstream-release-2.8.0
Automated cherry pick of #1550: fix purge aliyun account error by lbbg
2019-07-05 22:23:00 +08:00
ioito
45d3ead6bc optimized tag filter 2019-07-05 22:10:25 +08:00
ioito
8d8732d9b8 add without_user_meta filter 2019-07-05 21:34:10 +08:00
ioito
541f4b866a add usable filter for network 2019-07-05 18:51:13 +08:00
ioito
7732772b22 add deploy failed action log 2019-07-05 14:20:24 +08:00
ioito
5b377c6f25 fix purge aliyun account error by lbbg 2019-07-05 10:11:50 +08:00
yunion-ci-robot
b1abe6a49e Merge pull request #1533 from ioito/automated-cherry-pick-of-#1529-upstream-release-2.8.0
Automated cherry pick of #1529: fix create image with userCred issue
2019-07-03 23:24:54 +08:00
yunion-ci-robot
2be21aa3b8 Merge pull request #1528 from ioito/automated-cherry-pick-of-#1524-upstream-release-2.8.0
Automated cherry pick of #1524: fix azure reserved ips
2019-07-03 23:04:58 +08:00
ioito
d410f6ca62 fix create image with userCred issue 2019-07-03 20:59:09 +08:00
ioito
bc8e2ac7ae fix azure reserved ips 2019-07-03 20:13:36 +08:00
yunion-ci-robot
848c193ec0 Merge pull request #1516 from wanyaoqi/bugfix/wyq/fix-image-request-timeout-2.8
cherrypick : fix request image timeout
2019-07-03 18:07:55 +08:00
wanyaoqi
971f8ef1d1 fix request image timeout 2019-07-03 18:03:01 +08:00
yunion-ci-robot
ed378eee20 Merge pull request #1483 from ioito/automated-cherry-pick-of-#1479-upstream-release-2.8.0
Automated cherry pick of #1479: fix sync openstack hoststorages issue
2019-07-03 09:04:51 +08:00
yunion-ci-robot
cd71801953 Merge pull request #1494 from ioito/automated-cherry-pick-of-#1486-upstream-release-2.8.0
Automated cherry pick of #1486: fix azure set secgroup error
2019-07-03 08:28:52 +08:00
yunion-ci-robot
829d81b917 Merge pull request #1499 from wanyaoqi/automated-cherry-pick-of-#1495-upstream-release-2.8.0
Automated cherry pick of #1495: fix export data
2019-07-02 22:13:51 +08:00
wanyaoqi
57ef1d39a4 fix export data 2019-07-02 22:05:55 +08:00
ioito
ed5fdfbcfd fix azure set secgroup error 2019-07-02 21:25:39 +08:00
ioito
a1b6e811e2 fix sync openstack hoststorages issue 2019-07-02 20:13:27 +08:00
yunion-ci-robot
e984394b3b Merge pull request #1478 from wanyaoqi/automated-cherry-pick-of-#1471-upstream-release-2.8.0
Automated cherry pick of #1471: fix export data, set no limit; expand timeout
2019-07-02 18:50:55 +08:00
wanyaoqi
3dbfba68f8 fix export data, set no limit; expand timeout 2019-07-02 18:12:25 +08:00
yunion-ci-robot
4daae92728 Merge pull request #1470 from ioito/automated-cherry-pick-of-#1467-upstream-release-2.8.0
Automated cherry pick of #1467: fix create disk scheduler failed
2019-07-02 16:50:53 +08:00
ioito
e56ed6106d fix create disk scheduler failed 2019-07-02 16:49:09 +08:00
yunion-ci-robot
762c8b46e9 Merge pull request #1448 from ioito/automated-cherry-pick-of-#1420-upstream-release-2.8.0
Automated cherry pick of #1420: remove keypair info if rebuild-root net set keypair
2019-07-01 11:20:53 +08:00
ioito
e467356ac9 remove keypair info if rebuild-root net set keypair 2019-07-01 10:31:14 +08:00
yunion-ci-robot
09cf8cc4fc Merge pull request #1430 from yousong/automated-cherry-pick-of-#1421-release-2.8.0
Automated cherry pick of #1421: httperrors: 支持从msgTmpl转换为带%s的msgFmt
2019-06-29 14:32:52 +08:00
Yousong Zhou
c39df519db validators: errors: 使用msgFmt而非包含{NN}的msgTmpl 2019-06-29 06:28:40 +00:00
Yousong Zhou
e31788bc52 httperrors: 支持从msgTmpl转换为带%s的msgFmt 2019-06-29 06:28:40 +00:00
yunion-ci-robot
17ca98f347 Merge pull request #1403 from yousong/automated-cherry-pick-of-#1400-release-2.8.0
Automated cherry pick of #1400: lbagent: 启动时全量取API数据
2019-06-27 17:20:53 +08:00
yunion-ci-robot
7f2f48e0da Merge pull request #1399 from ioito/automated-cherry-pick-of-#1396-upstream-release-2.8.0
Automated cherry pick of #1396: wait ready or running after change vm config
2019-06-27 17:18:51 +08:00
yunion-ci-robot
3724780b00 Merge pull request #1394 from wanyaoqi/feature/wyq/live-migrate-filter-cpu-model-cherrypick-2.8
Cherrypick: Feature/wyq/live migrate filter cpu model cherrypick 2.8
2019-06-27 17:00:50 +08:00
yunion-ci-robot
02d9858295 Merge pull request #1410 from yousong/automated-cherry-pick-of-#670-release-2.8.0
Automated cherry pick of #670: atexit: 添加用于记录在进程退出时执行的队列
2019-06-26 22:04:51 +08:00
Yousong Zhou
4895059f36 cloudcommon: 添加--log-file-prefix选项
指定日志文件名,rotate 10,每个100MB
2019-06-26 14:00:47 +00:00
Yousong Zhou
9bba63bd6d atexit: 添加用于记录在进程退出时执行的队列 2019-06-26 13:59:35 +00:00
Yousong Zhou
2fd839d4da lbagent: 启动时全量取API数据
此变更之后,data/目录内容更多服务于调试作用
2019-06-26 12:26:41 +00:00
ioito
c70e3c8b2d wait ready or running after change vm config 2019-06-26 19:33:58 +08:00
yunion-ci-robot
544597952a Merge pull request #1392 from wanyaoqi/automated-cherry-pick-of-#1174-upstream-release-2.8.0
Automated cherry pick of #1174: import running libvirt guests
2019-06-26 16:48:50 +08:00
wanyaoqi
02195bb345 live migrate filter by cpu model and mircocode, fix guest backup status, misc fix 2019-06-26 13:26:19 +08:00
wanyaoqi
4ff2335e8a import running libvirt guests 2019-06-26 12:57:32 +08:00
yunion-ci-robot
74f981a25f Merge pull request #1375 from wanyaoqi/automated-cherry-pick-of-#1357-upstream-release-2.8.0
Automated cherry pick of #1357: set default http client timeout
2019-06-25 23:27:03 +08:00
yunion-ci-robot
8129339cbe Merge pull request #1383 from ioito/automated-cherry-pick-of-#1380-upstream-release-2.8.0
Automated cherry pick of #1380: clear scheduler cache afeter change host cmtbound
2019-06-25 23:15:55 +08:00
ioito
07463281ac clear scheduler cache afeter change host cmtbound 2019-06-25 21:01:57 +08:00
wanyaoqi
ff39d620ec set default http client timeout 2019-06-25 15:40:04 +08:00
yunion-ci-robot
4ecb311920 Merge pull request #1370 from yousong/automated-cherry-pick-of-#1369-release-2.8.0
Automated cherry pick of #1369: lbagents: 改正vrrp模板
2019-06-25 11:46:49 +08:00
Yousong Zhou
7bb55c16e4 validators: 默认将pending deleted的模型排除在外 2019-06-25 02:46:44 +00:00
Yousong Zhou
ec7a344ebc db: 添加IPendingDeletable类型 2019-06-25 02:46:44 +00:00
Yousong Zhou
4f481e4982 lbagents: 改正vrrp模板 2019-06-25 02:46:44 +00:00
yunion-ci-robot
cc8296fb6a Merge pull request #1355 from ioito/automated-cherry-pick-of-#1352-upstream-release-2.8.0
Automated cherry pick of #1352: avoid duplicate network name
2019-06-24 12:34:49 +08:00
ioito
0bf7f42fc4 avoid duplicate network name 2019-06-24 11:26:39 +08:00
yunion-ci-robot
abab15a405 Merge pull request #1299 from Zexi/automated-cherry-pick-of-#1298-upstream-release-2.8.0
Automated cherry pick of #1298: baremetal: change ipmi user password
2019-06-22 12:44:49 +08:00
Zexi Li
94ebff5848 Merge pull request #1342 from Zexi/automated-cherry-pick-of-#1341-upstream-release-2.8.0
Automated cherry pick of #1341: scheduler: fix prefer avoid score
2019-06-21 14:05:54 +08:00
Zexi
b30a0c1a19 scheduler: fix prefer avoid score 2019-06-21 13:59:09 +08:00
yunion-ci-robot
a3f5f5ed58 Merge pull request #1317 from wanyaoqi/bugfix/wyq/fix-detach-storage-2.8.0
bugfix: host attach storage sync storage status
2019-06-19 20:17:52 +08:00
wanyaoqi
03aa98ca60 fix host attach storage sync status 2019-06-19 19:46:03 +08:00
yunion-ci-robot
d873ae60d8 Merge pull request #1308 from ioito/automated-cherry-pick-of-#1305-upstream-release-2.8.0
Automated cherry pick of #1305: dissocate and release eip optimized\
2019-06-19 18:06:51 +08:00
yunion-ci-robot
0de4e56ccc Merge pull request #1313 from ioito/automated-cherry-pick-of-#1273-upstream-release-2.8.0
Automated cherry pick of #1273: add azure region geographicinfo
2019-06-19 18:03:50 +08:00
yunion-ci-robot
716be40154 Merge pull request #1268 from ioito/automated-cherry-pick-of-#1265-upstream-release-2.8.0
Automated cherry pick of #1265: avoid openstack zone externalid equals
2019-06-19 17:45:52 +08:00
ioito
7e087d8b1e add azure region geographicinfo 2019-06-19 17:42:26 +08:00
ioito
ee702037c2 dissocate and release eip optimized\ 2019-06-19 16:30:16 +08:00
Zexi
4aeb931c3c baremetal: change ipmi user password 2019-06-19 11:17:05 +08:00
yunion-ci-robot
ba566d3e58 Merge pull request #1280 from wanyaoqi/automated-cherry-pick-of-#1278-upstream-release-2.8.0
Automated cherry pick of #1278: filter storage not attached
2019-06-18 17:22:54 +08:00
wanyaoqi
427f34e0c0 filter storage not attached 2019-06-18 16:57:29 +08:00
yunion-ci-robot
ccd1ff02a3 Merge pull request #1253 from ioito/automated-cherry-pick-of-#1240-upstream-release-2.8.0
Automated cherry pick of #1240: choice valid storage for storagecache
2019-06-18 11:08:52 +08:00
ioito
1f3bcbfbeb avoid openstack zone externalid equals 2019-06-17 21:02:46 +08:00
yunion-ci-robot
5648423a23 Merge pull request #1260 from wanyaoqi/automated-cherry-pick-of-#1256-upstream-release-2.8.0
Automated cherry pick of #1256: fix guest sync status interval
2019-06-17 15:53:52 +08:00
wanyaoqi
823224302c fix guest sync status interval 2019-06-17 15:47:37 +08:00
ioito
5853323903 choice valid storage for storagecache 2019-06-17 10:17:02 +08:00
yunion-ci-robot
7266ab9599 Merge pull request #1231 from ioito/automated-cherry-pick-of-#1230-upstream-release-2.8.0
Automated cherry pick of #1230: fix cache image failed error
2019-06-16 17:28:52 +08:00
ioito
030d9e3cf3 fix cache image failed error 2019-06-16 14:33:49 +08:00
yunion-ci-robot
43bcced0d8 Merge pull request #1215 from ioito/automated-cherry-pick-of-#1196-upstream-release-2.8.0
Automated cherry pick of #1196: fix balance permission error
2019-06-15 21:39:52 +08:00
ioito
5b44d7029d fix balance permission error 2019-06-15 13:51:17 +08:00
yunion-ci-robot
3295748d39 Merge pull request #1209 from yousong/automated-cherry-pick-of-#1201-release-2.8.0
Automated cherry pick of #1201: cloudcommon: 移除非必要日志
2019-06-15 10:17:51 +08:00
Yousong Zhou
763f476a72 cloudcommon: 移除非必要日志 2019-06-14 13:41:44 +00:00
yunion-ci-robot
1e31160cf8 Merge pull request #1171 from yousong/automated-cherry-pick-of-#1168-release-2.8.0
Automated cherry pick of #1168: webconsole: 改正文件权限
2019-06-13 14:24:53 +08:00
Yousong Zhou
1344fe9812 webconsole: 改正文件权限
- 密钥不需要执行权限
 - 先改权限再写内容
2019-06-12 10:28:03 +00:00
yunion-ci-robot
dff8e9362b Merge pull request #1167 from ioito/automated-cherry-pick-of-#1164-upstream-release-2.8.0
Automated cherry pick of #1164: 添加vpc操作日志
2019-06-12 18:02:53 +08:00
ioito
22c602962f 添加vpc操作日志 2019-06-12 17:00:20 +08:00
yunion-ci-robot
a9872462b2 Merge pull request #1156 from ioito/automated-cherry-pick-of-#1120-upstream-release-2.8.0
Automated cherry pick of #1120: network创建或删除后刷新调度缓存
2019-06-12 15:26:52 +08:00
yunion-ci-robot
44892c8bec Merge pull request #1161 from wanyaoqi/automated-cherry-pick-of-#1158-upstream-release-2.8.0
Automated cherry pick of #1158: fix attach able storage
2019-06-12 14:43:53 +08:00
wanyaoqi
a4ff3ea2d0 fix attach able storage 2019-06-12 13:55:47 +08:00
ioito
1213809528 network创建或删除后刷新调度缓存 2019-06-12 11:53:18 +08:00
yunion-ci-robot
cc2af45e9e Merge pull request #1119 from ioito/automated-cherry-pick-of-#1116-upstream-release-2.8.0
Automated cherry pick of #1116: fix qcloud disk create name error
2019-06-12 09:04:52 +08:00
yunion-ci-robot
066aa9ec86 Merge pull request #1141 from yousong/automated-cherry-pick-of-#1130-release-2.8.0
Automated cherry pick of #1130: networks: merge与split时将lbnetwork考虑进去
2019-06-11 23:06:52 +08:00
yunion-ci-robot
cdf76b9f6a Merge pull request #1138 from wanyaoqi/automated-cherry-pick-of-#1135-upstream-release-2.8.0
Automated cherry pick of #1135: fix disk delete task base
2019-06-11 20:33:52 +08:00
Yousong Zhou
0176474cd6 networks: merge与split时将lbnetwork考虑进去
- 共用代码,并放到独立的文件中
 - 尽力更新,中途出错不中断,最后一起报出
2019-06-11 06:11:39 +00:00
wanyaoqi
665dd5b4a4 fix disk delete task base 2019-06-11 11:11:10 +08:00
Zexi Li
0a7496420f Merge pull request #1125 from Zexi/automated-cherry-pick-of-#1122-upstream-release-2.8.0
Automated cherry pick of #1122: scheduler: recover panic when stop timer
2019-06-10 17:18:36 +08:00
Zexi
23f549790b scheduler: recover panic when stop timer 2019-06-10 17:17:49 +08:00
ioito
aadee555e1 fix qcloud disk create name error 2019-06-10 16:05:16 +08:00
yunion-ci-robot
b0725e844c Merge pull request #1110 from wanyaoqi/automated-cherry-pick-of-#1099-upstream-release-2.8.0
Automated cherry pick of #1099: fix reserved memory
2019-06-09 23:00:51 +08:00
wanyaoqi
59856937b0 fix disk delete 2019-06-09 22:59:14 +08:00
wanyaoqi
41b1e4b909 fix reserved memory 2019-06-09 22:59:14 +08:00
yunion-ci-robot
52a9f58830 Merge pull request #1106 from Zexi/automated-cherry-pick-of-#1104-upstream-release-2.8.0
Automated cherry pick of #1104: fix: disk input erase storage_id by backend
2019-06-09 11:18:51 +08:00
Zexi
cacdbce9df fix: disk input erase storage_id by backend 2019-06-09 11:02:41 +08:00
yunion-ci-robot
c5716627f7 Merge pull request #1103 from wanyaoqi/automated-cherry-pick-of-#1100-upstream-release-2.8.0
Automated cherry pick of #1100: gpfs
2019-06-09 01:00:50 +08:00
wanyaoqi
517de40e02 gpfs 2019-06-06 23:30:53 +08:00
yunion-ci-robot
5b2dbff139 Merge pull request #1095 from ioito/automated-cherry-pick-of-#1092-upstream-release-2.8.0
Automated cherry pick of #1092: 修复参数赋值问题
2019-06-06 23:25:51 +08:00
ioito
39aea207d9 修复参数赋值问题 2019-06-06 18:14:26 +08:00
yunion-ci-robot
5cc34f8047 Merge pull request #1067 from yousong/automated-cherry-pick-of-#1063-upstream-release-2.8.0
Automated cherry pick of #1063: cloudproviders: 调整lb资源清理顺序
2019-06-05 10:01:49 +08:00
Yousong Zhou
3b44feddee cloudproviders: 调整lb资源清理顺序
lbbg可能被lblis引用,应先清理lblis,再清理lbbg
2019-06-04 17:06:58 +00:00
yunion-ci-robot
e693091ce3 Merge pull request #1030 from ioito/automated-cherry-pick-of-#1024-upstream-release-2.8.0
Automated cherry pick of #1024: 避免未使用最优storage
2019-06-03 18:21:58 +08:00
yunion-ci-robot
13ff2f2247 Merge pull request #1041 from wanyaoqi/automated-cherry-pick-of-#1038-upstream-release-2.8.0
Automated cherry pick of #1038: fix imported bm server start
2019-06-03 18:09:57 +08:00
wanyaoqi
d9ff038db6 fix imported bm server start 2019-06-03 15:29:34 +08:00
ioito
4baf096187 避免未使用最优storage 2019-06-03 10:07:34 +08:00
yunion-ci-robot
07fdd654cc Merge pull request #986 from swordqiu/automated-cherry-pick-of-#983-upstream-release-2.8.0
Automated cherry pick of #983: fix: esxi vm may fail on start or delete in batch
2019-05-31 13:52:19 +08:00
yunion-ci-robot
aacb83b97f Merge pull request #1011 from yunion-ci-robot/cherry-pick-1009-to-release/2.8.0
[release/2.8.0] fix on guest migrate fail
2019-05-31 13:18:20 +08:00
wanyaoqi
8ee225196a fix on guest migrate fail 2019-05-31 05:16:04 +00:00
yunion-ci-robot
191d857e0d Merge pull request #998 from yunion-ci-robot/cherry-pick-968-to-release/2.8.0
[release/2.8.0] 避免oUserData为nil时野指针访问
2019-05-30 17:49:22 +08:00
ioito
fd4fdbb1c4 避免oUserData为nil时野指针访问 2019-05-30 09:37:44 +00:00
yunion-ci-robot
5473c760e1 Merge pull request #996 from yunion-ci-robot/cherry-pick-993-to-release/2.8.0
[release/2.8.0] fix guest display metadata
2019-05-30 16:56:25 +08:00
wanyaoqi
11a5e235e1 fix guest display metadata 2019-05-30 08:49:11 +00:00
yunion-ci-robot
6d661dab16 Merge pull request #989 from yunion-ci-robot/cherry-pick-955-to-release/2.8.0
[release/2.8.0] 避免webconsole频繁连接server,导致IP被封禁
2019-05-30 15:17:18 +08:00
ioito
0b829f4307 避免频繁连接server 2019-05-30 07:04:24 +00:00
Qiu Jian
1e4a992163 fix: esxi vm may fail on start or delete in batch 2019-05-30 14:44:08 +08:00
yunion-ci-robot
6c19d666ac Merge pull request #979 from Zexi/automated-cherry-pick-of-#978-upstream-release-2.8.0
Automated cherry pick of #978: scheduler: add pending usage process
2019-05-29 20:39:20 +08:00
Zexi
d7b681522e scheduler: add pending usage process 2019-05-29 19:48:08 +08:00
yunion-ci-robot
edb5eea56d Merge pull request #966 from yunion-ci-robot/cherry-pick-956-to-release/2.8.0
[release/2.8.0] lb: 支持直接指定ip作为后端
2019-05-29 11:44:20 +08:00
Yousong Zhou
9da2e26e04 mcclient: options: use --loadbalancer for consistency
Fixes 2df78f
2019-05-29 01:52:03 +00:00
Yousong Zhou
dc9f0f32a1 loadbalancerbackends: 支持直接指定IP地址 2019-05-29 01:52:03 +00:00
yunion-ci-robot
82c609392c Merge pull request #954 from ioito/automated-cherry-pick-of-#943-upstream-release-2.8.0
Automated cherry pick of #943: 避免转换成shell格式后导致合并失败
2019-05-28 22:07:20 +08:00
ioito
dc68525efa 避免转换成shell格式后导致合并失败 2019-05-28 17:02:23 +08:00
yunion-ci-robot
14e5285131 Merge pull request #949 from Zexi/automated-cherry-pick-of-#29-upstream-release-2.8.0
Automated cherry pick of #29: feat: 支持为虚拟机或宿主机创建报警规则
2019-05-28 16:50:18 +08:00
yunion-ci-robot
e9002a27f9 Merge pull request #951 from wanyaoqi/automated-cherry-pick-of-#947-upstream-release-2.8.0
Automated cherry pick of #947: support add pid file
2019-05-28 16:13:19 +08:00
wanyaoqi
a717e8113c support add pid file 2019-05-28 16:03:41 +08:00
ningyu
7acd0b19f2 refactor: 修正RP提出的问题
- 创建报警规则时使用--xxx的方式,避免位置参数过多导致传递时记不住顺序
- 将nodealert-change-status拆分成2个命令:nodealert-enable, nodealert-disable
- 使用options.ListStructToParams和options.StructToParams方法来精减参数对象的构建
- 其它小问题,如:统一变量命名、纠正注释等
2019-05-28 15:56:19 +08:00
ningyu
57f5ffd3ea feat: 支持为虚拟机或宿主机创建报警规则
需要依赖的服务:meteralert2.8或以上版本
2019-05-28 15:56:19 +08:00
yunion-ci-robot
c8dcf080d5 Merge pull request #942 from yousong/bugfix/yousong-routetables-280
Cherrypick 933: routetables: 改正同步
2019-05-28 14:47:18 +08:00
yunion-ci-robot
056c89cfb6 Merge pull request #937 from yunion-ci-robot/cherry-pick-932-to-release/2.8.0
[release/2.8.0] 补充缺失的task stage
2019-05-28 13:31:19 +08:00
yunion-ci-robot
b377ba3712 Merge pull request #946 from wanyaoqi/automated-cherry-pick-of-#934-upstream-release-2.8.0
Automated cherry pick of #934: bugfix:
2019-05-28 12:14:18 +08:00
wanyaoqi
9ba2264d8c bugfix:
- fix import from libvirt
- fix server deploy
- fix guest migrate
- golang host bugfix
2019-05-28 12:08:17 +08:00
Yousong Zhou
35382351bd routetables: default to name rtbl-<vpc.name> 2019-05-27 13:22:18 +00:00
Yousong Zhou
0ff39b1cdc routetables: sync: add vpc-awareness 2019-05-27 13:21:17 +00:00
ioito
241eb619e1 补充缺失的task stage 2019-05-27 12:52:26 +00:00
yunion-ci-robot
fac76d231f Merge pull request #931 from ioito/automated-cherry-pick-of-#899-upstream-release-2.8.0
Automated cherry pick of #899: 删除账号时删除空的zone及region
2019-05-25 20:39:18 +08:00
yunion-ci-robot
1d08717ad4 Merge pull request #926 from ioito/automated-cherry-pick-of-#883-upstream-release-2.8.0
Automated cherry pick of #883: 避免同步出现重复eip记录
2019-05-25 20:37:19 +08:00
ioito
e9d1812ca1 删除账号时删除空的zone及region 2019-05-25 20:24:32 +08:00
ioito
fffd343266 避免同步出现重复eip记录 2019-05-25 17:56:06 +08:00
yunion-ci-robot
12942b2877 Merge pull request #924 from yunion-ci-robot/cherry-pick-921-to-release/2.8.0
[release/2.8.0] 校验aliyun eip带宽范围
2019-05-25 17:51:18 +08:00
ioito
edc4dbe580 校验aliyun eip带宽范围 2019-05-25 09:39:45 +00:00
yunion-ci-robot
ce71190faf Merge pull request #918 from ioito/automated-cherry-pick-of-#894-upstream-release-2.8.0
Automated cherry pick of #894: 避免keystone region中使用-导致region被截取
2019-05-25 11:04:17 +08:00
ioito
09f2d6a61e 避免keystone region中使用-导致region被截取 2019-05-25 09:57:29 +08:00
yunion-ci-robot
fc25fc30cb Merge pull request #914 from wanyaoqi/automated-cherry-pick-of-#900-upstream-release-2.8.0
Automated cherry pick of #900: misc fix:
2019-05-24 14:44:18 +08:00
wanyaoqi
41c4b8e890 misc fix:
- fix undeploy backup guest
- fix host service cron job
- task add recover
2019-05-24 13:29:33 +08:00
yunion-ci-robot
a0763b19a9 Merge pull request #904 from yunion-ci-robot/cherry-pick-890-to-release/2.8.0
[release/2.8.0] guests: 变更IP地址时尽量保留原网卡设定
2019-05-24 10:15:18 +08:00
yunion-ci-robot
dd26f69596 Merge pull request #906 from yunion-ci-robot/cherry-pick-896-to-release/2.8.0
[release/2.8.0] 修复多账号导致openstack region同步异常
2019-05-24 10:14:18 +08:00
ioito
27e38d7583 未设置正确的region prefix 2019-05-24 01:48:44 +00:00
Yousong Zhou
c75d2e1b0d guests: change-ipaddr: 尽量保留原网卡配置
网卡序号,带宽限定等

Reported-by: Wenlong Wang
2019-05-24 01:42:39 +00:00
yunion-ci-robot
474872edad Merge pull request #892 from wanyaoqi/automated-cherry-pick-of-#888-upstream-release-2.8.0
Automated cherry pick of #888: - set disk storage_id not required - can't do syncstatus on guest has active tasks in last one hour - fix guestdisk index set wrong number on guest attach disk
2019-05-23 17:16:17 +08:00
wanyaoqi
557f5a304f - set disk storage_id not required - can't do syncstatus on guest has active tasks in last one hour - fix guestdisk index set wrong number on guest attach disk 2019-05-23 11:15:03 +08:00
yunion-ci-robot
a6bd3d4b6a Merge pull request #885 from yousong/automated-cherry-pick-of-#880-release-2.8.0
Automated cherry pick of #880: mcclient: RouteOptions: 缩短命令行参数长度
2019-05-22 14:26:16 +08:00
Yousong Zhou
06c009be9d climc: 在打印路由条目时显示下一跳资源id 2019-05-22 04:00:55 +00:00
Yousong Zhou
740edba9d4 routetables: 厘清指针使用 2019-05-22 04:00:55 +00:00
Yousong Zhou
95f0b5ec73 mcclient: 使--vpc成为必选参数 2019-05-22 04:00:55 +00:00
Yousong Zhou
dbe898e643 mcclient: RouteOptions: 缩短命令行参数长度 2019-05-22 04:00:55 +00:00
yunion-ci-robot
a0fbdf96ab Merge pull request #877 from ioito/automated-cherry-pick-of-#875-upstream-release-2.8.0
Automated cherry pick of #875: openstack认证添加domain_name参数
2019-05-22 00:37:18 +08:00
ioito
a800d9e2d8 openstack认证添加domain_name参数 2019-05-21 17:31:13 +08:00
yunion-ci-robot
b5e2051d6a Merge pull request #874 from ioito/automated-cherry-pick-of-#860-upstream-release-2.8.0
Automated cherry pick of #860: 使用driver注入密码,复用代码
2019-05-21 14:03:21 +08:00
ioito
b67c5cd713 避免climc使用公有云镜像时未设置prefix region导致虚拟机创建失败 2019-05-21 13:32:57 +08:00
ioito
1de046f9eb 使用driver注入密码,复用代码 2019-05-21 13:32:57 +08:00
yunion-ci-robot
6201bfb4f9 Merge pull request #868 from ioito/automated-cherry-pick-of-#866-upstream-release-2.8.0
Automated cherry pick of #866: fix openstack region sync
2019-05-20 22:47:17 +08:00
ioito
75a3f00de9 fix openstack region sync 2019-05-20 22:18:48 +08:00
yunion-ci-robot
3af1dc4dbf Merge pull request #864 from ioito/automated-cherry-pick-of-#859-upstream-release-2.8.0
Automated cherry pick of #859: 不同类型的tag使用对应的参数进行过滤
2019-05-20 21:29:20 +08:00
ioito
4fbd8ce9ce 不同类型的tag使用对应的参数进行过滤 2019-05-20 21:19:40 +08:00
yunion-ci-robot
b1e000ae64 Merge pull request #857 from ioito/automated-cherry-pick-of-#855-upstream-release-2.8.0
Automated cherry pick of #855: 修复调用错误方法
2019-05-20 15:05:16 +08:00
ioito
7c84972c32 修复调用错误方法 2019-05-20 13:48:05 +08:00
yunion-ci-robot
a92791c30b Merge pull request #854 from ioito/automated-cherry-pick-of-#842-upstream-release-2.8.0
Automated cherry pick of #842: 删除虚拟机同时删除lb相关记录
2019-05-18 20:20:18 +08:00
ioito
4fd8a3df02 删除虚拟机同时删除lb相关记录 2019-05-18 20:15:42 +08:00
yunion-ci-robot
75b7a00183 Merge pull request #838 from ioito/automated-cherry-pick-of-#810-upstream-release-2.8.0
Automated cherry pick of #810: 限制添加同一个vpc底下的虚拟机
2019-05-16 17:36:36 +08:00
ioito
217d375f3c 避免关不掉访问控制 2019-05-16 16:47:06 +08:00
ioito
69085c7c63 显示acl名称 2019-05-16 16:47:06 +08:00
ioito
844ce98fba 限制添加同一个vpc底下的虚拟机 2019-05-16 16:47:06 +08:00
yunion-ci-robot
d3b6f6cdb7 Merge pull request #832 from ioito/automated-cherry-pick-of-#830-upstream-release-2.8.0
Automated cherry pick of #830: 修复删除账号错误
2019-05-16 12:38:34 +08:00
ioito
a667a5499c 修复删除账号错误 2019-05-16 12:23:36 +08:00
yunion-ci-robot
4fde087e9a Merge pull request #829 from yunion-ci-robot/cherry-pick-827-to-release/2.8.0
[release/2.8.0] bugfix: fix host setup network
2019-05-16 00:32:35 +08:00
wanyaoqi
937e0d58f8 fix host setup network 2019-05-15 16:30:06 +00:00
yunion-ci-robot
bfcab5b1f6 Merge pull request #826 from yunion-ci-robot/cherry-pick-822-to-release/2.8.0
[release/2.8.0] OpenStack: 增加同步数据准确性
2019-05-15 22:50:36 +08:00
ioito
0f2e322b57 增加同步数据准确性 2019-05-15 14:46:47 +00:00
yunion-ci-robot
dccaf02fea Merge pull request #824 from ioito/automated-cherry-pick-of-#812-upstream-release-2.8.0
Automated cherry pick of #812: 设置端口和权重后同步到公有云上
2019-05-15 22:44:37 +08:00
ioito
451d83511a 设置端口和权重后同步到公有云上 2019-05-15 22:33:31 +08:00
yunion-ci-robot
760f5073e1 Merge pull request #821 from yunion-ci-robot/cherry-pick-811-to-release/2.8.0
[release/2.8.0] bugfix: host cpuset bugfix
2019-05-15 17:09:37 +08:00
wanyaoqi
dcd46d77ec guest fix set oom_adj 2019-05-15 08:56:07 +00:00
wanyaoqi
5142a04806 host cpuset bugfix 2019-05-15 08:56:07 +00:00
yunion-ci-robot
083600ebc7 Merge pull request #818 from yunion-ci-robot/cherry-pick-809-to-release/2.8.0
[release/2.8.0] bugfix: disable clean iptables && fix mac equal
2019-05-15 16:49:36 +08:00
wanyaoqi
17adf2a067 disable clean iptables && fix mac equal 2019-05-15 08:37:21 +00:00
yunion-ci-robot
90b0def56f Merge pull request #816 from yunion-ci-robot/cherry-pick-813-to-release/2.8.0
[release/2.8.0] 避免使用错误方法损坏id
2019-05-15 15:00:35 +08:00
ioito
f7d266f6a3 避免使用错误方法损坏id 2019-05-15 06:58:45 +00:00
yunion-ci-robot
f21b491155 Merge pull request #803 from yunion-ci-robot/cherry-pick-802-to-release/2.8.0
[release/2.8.0] feature: disable cron jobs on slave node
2019-05-13 21:21:40 +08:00
wanyaoqi
cda14a67d2 disable cron jobs on slave node 2019-05-13 13:10:57 +00:00
yunion-ci-robot
2b3f6657bd Merge pull request #801 from yunion-ci-robot/cherry-pick-784-to-release/2.8.0
[release/2.8.0] 避免创建时使用不同公有云的镜像
2019-05-13 19:19:36 +08:00
ioito
89d4feb5a4 避免创建时使用不同公有云的镜像 2019-05-13 11:18:12 +00:00
yunion-ci-robot
a30ddddb76 Merge pull request #798 from yunion-ci-robot/cherry-pick-797-to-release/2.8.0
[release/2.8.0] fix: scheduler not init app db
2019-05-13 19:15:35 +08:00
yunion-ci-robot
b85f131d4a Merge pull request #793 from yunion-ci-robot/cherry-pick-790-to-release/2.8.0
[release/2.8.0] bugfix : fix start script no pid file
2019-05-13 19:14:34 +08:00
Zexi
9c813cc0fb fix: scheduler not init app db 2019-05-13 11:14:07 +00:00
yunion-ci-robot
5aebe01403 Merge pull request #796 from Zexi/automated-cherry-pick-of-#785-upstream-release-2.8.0
Automated cherry pick of #785: fix: add host convert same disk spec check
2019-05-13 18:34:36 +08:00
Zexi
317e62bca7 fix: add host convert same disk spec check 2019-05-13 18:30:28 +08:00
yunion-ci-robot
3f60f283a1 Merge pull request #795 from yunion-ci-robot/cherry-pick-791-to-release/2.8.0
[release/2.8.0] 避免任务完成后依然返回timeout错误
2019-05-13 17:07:33 +08:00
ioito
2749df9564 避免任务完成后依然返回timeout错误 2019-05-13 08:53:09 +00:00
wanyaoqi
b71935f626 fix no pid file 2019-05-13 08:52:04 +00:00
yunion-ci-robot
95c4c18617 Merge pull request #788 from yunion-ci-robot/cherry-pick-786-to-release/2.8.0
[release/2.8.0] bugfix: fix guest delele backup log event
2019-05-13 11:27:35 +08:00
wanyaoqi
e41fdaa8cf fix guest delele backup log event 2019-05-13 03:18:12 +00:00
yunion-ci-robot
eb77f2624c Merge pull request #781 from yunion-ci-robot/cherry-pick-778-to-release/2.8.0
[release/2.8.0] 允许普通用户set manager_id
2019-05-11 17:33:34 +08:00
yunion-ci-robot
7833c85c3e Merge pull request #779 from yunion-ci-robot/cherry-pick-769-to-release/2.8.0
[release/2.8.0] 负载均衡日志补全
2019-05-11 17:28:33 +08:00
ioito
800b64f700 允许普通用户set manager_id 2019-05-11 09:26:45 +00:00
ioito
3a72ea013c 负载均衡日志补全 2019-05-11 09:23:50 +00:00
yunion-ci-robot
c1b4d88682 Merge pull request #777 from yunion-ci-robot/cherry-pick-759-to-release/2.8.0
[release/2.8.0] Aliyun: 避免cache image失败
2019-05-11 17:12:35 +08:00
ioito
c07fdfd572 避免cache image失败 2019-05-11 09:02:16 +00:00
yunion-ci-robot
8f368e0c76 Merge pull request #775 from yunion-ci-robot/cherry-pick-770-to-release/2.8.0
[release/2.8.0] bugfix:  fix host deploy windows password, user can get backup host id
2019-05-10 21:12:34 +08:00
wanyaoqi
9f83b4bc2f qemu prevent oom 2019-05-10 12:55:16 +00:00
wanyaoqi
8de218e5a8 fix host deploy windows password 2019-05-10 12:55:15 +00:00
wanyaoqi
552db484ed user can get backup host id 2019-05-10 12:55:14 +00:00
yunion-ci-robot
cfea0b6539 Merge pull request #773 from wanyaoqi/bugfix/wyq/backport-fix
Bugfix: backport fix
2019-05-10 20:53:35 +08:00
wanyaoqi
f5123e26a4 backup port fix libvirt import 2019-05-10 20:49:18 +08:00
yunion-ci-robot
9a5ffdd0ad Merge pull request #771 from ioito/automated-cherry-pick-of-#767-upstream-release-2.8.0
Automated cherry pick of #767: 移除多余的方法
2019-05-10 12:10:34 +08:00
ioito
a51b105266 移除多余的方法 2019-05-10 11:17:45 +08:00
yunion-ci-robot
5777f88cb1 Merge pull request #766 from yunion-ci-robot/cherry-pick-747-to-release/2.8.0
[release/2.8.0] sku provider filter by zone
2019-05-09 18:20:34 +08:00
yunion-ci-robot
694bbce542 Merge pull request #764 from yunion-ci-robot/cherry-pick-762-to-release/2.8.0
[release/2.8.0] 避免显示脏的image信息
2019-05-09 18:19:34 +08:00
TangBin
6d0971a7a2 sku providerFilter add more comment 2019-05-09 09:53:28 +00:00
TangBin
cb43ab057a sku provider filter by region 2019-05-09 09:53:28 +00:00
TangBin
608395be5a sku provider filter by zone 2019-05-09 09:53:28 +00:00
ioito
984144b6e7 避免显示脏的image信息 2019-05-09 09:52:01 +00:00
yunion-ci-robot
d75e3dea47 Merge pull request #761 from wanyaoqi/automated-cherry-pick-of-#758-upstream-release-2.8.0
Automated cherry pick of #758: fix go vet report bugs
2019-05-09 15:13:34 +08:00
wanyaoqi
e5206f0a2e Readme add go reporter 2019-05-09 15:08:25 +08:00
wanyaoqi
acacce2748 fix go vet report bugs 2019-05-09 15:07:46 +08:00
yunion-ci-robot
ca7beee2f3 Merge pull request #757 from yunion-ci-robot/cherry-pick-754-to-release/2.8.0
[release/2.8.0] bugfix :fix get storage by access path
2019-05-08 18:24:33 +08:00
wanyaoqi
2687527c68 fix get storage by access path 2019-05-08 10:23:39 +00:00
yunion-ci-robot
911d553d9b Merge pull request #753 from yunion-ci-robot/cherry-pick-749-to-release/2.8.0
[release/2.8.0] fix: admaster bug, disk-purge nil pointer error
2019-05-08 13:29:34 +08:00
Qiu Jian
0b08d3e7a8 fix: admaster bug, disk-purge nil pointer error 2019-05-08 05:28:03 +00:00
yunion-ci-robot
4707c2c563 Merge pull request #751 from yunion-ci-robot/cherry-pick-748-to-release/2.8.0
[release/2.8.0] bugfix: fix sync status on stoping
2019-05-08 13:12:32 +08:00
wanyaoqi
3276bd4f98 fix sync status on stoping 2019-05-08 04:54:11 +00:00
yunion-ci-robot
22d531f483 Merge pull request #744 from yunion-ci-robot/cherry-pick-726-to-release/2.8.0
[release/2.8.0] set host is import && fix notify template
2019-05-07 13:07:16 +08:00
yunion-ci-robot
83cdc9d74b Merge pull request #742 from yunion-ci-robot/cherry-pick-725-to-release/2.8.0
[release/2.8.0] bugfix: fix host image service, disable https
2019-05-07 13:06:14 +08:00
wanyaoqi
3482d5e3a7 set host is import && fix notify template 2019-05-07 04:33:00 +00:00
wanyaoqi
5588431454 fix host image service, disable https 2019-05-07 04:31:50 +00:00
yunion-ci-robot
a51f9f949c Merge pull request #739 from yunion-ci-robot/cherry-pick-731-to-release/2.8.0
[release/2.8.0] remove gpu passthrough params addr
2019-05-07 12:31:17 +08:00
yunion-ci-robot
829001d7bd Merge pull request #737 from yunion-ci-robot/cherry-pick-736-to-release/2.8.0
[release/2.8.0] fix: resource set schedtags
2019-05-07 12:18:15 +08:00
wanyaoqi
270c58e38e remove gpu passthrough params addr 2019-05-07 04:17:32 +00:00
Zexi
90b55e576c fix: resource set schedtags 2019-05-07 04:16:29 +00:00
yunion-ci-robot
f886e90c98 Merge pull request #733 from yunion-ci-robot/cherry-pick-732-to-release/2.8.0
[release/2.8.0] update host batch register
2019-05-07 11:33:15 +08:00
TangBin
e4c989cbb3 update host batch register 2019-05-07 03:30:11 +00:00
yunion-ci-robot
e232a32a06 Merge pull request #721 from Zexi/automated-cherry-pick-of-#716-upstream-release-2.8.0
Automated cherry pick of #716: fix baremetal disk config auto extend not work and ipmi_info not record
2019-05-05 20:52:15 +08:00
Zexi
8c61d303de fix baremetal disk config auto extend not work and ipmi_info not record 2019-05-05 20:14:43 +08:00
yunion-ci-robot
98971416d0 Merge pull request #718 from yunion-ci-robot/cherry-pick-711-to-release/2.8.0
[release/2.8.0] bugfix:  fix delete backup status
2019-05-05 19:54:15 +08:00
wanyaoqi
3a6ef8db09 fix backup status 2019-05-05 11:06:45 +00:00
yunion-ci-robot
da54beb6a9 Merge pull request #715 from yunion-ci-robot/cherry-pick-710-to-release/2.8.0
[release/2.8.0] 设置镜像hw_qemu_guest_agent属性
2019-05-05 16:52:15 +08:00
yunion-ci-robot
461cdefe96 Merge pull request #712 from yunion-ci-robot/cherry-pick-699-to-release/2.8.0
[release/2.8.0] bugfix: fix baremetal online prepare!
2019-05-05 16:51:15 +08:00
ioito
4dbf714d63 设置镜像hw_qemu_guest_agent属性 2019-05-05 08:36:46 +00:00
wanyaoqi
d5424e1372 fix baremetal online prepare! 2019-05-05 04:35:31 +00:00
yunion-ci-robot
fdb41edf39 Merge pull request #708 from yunion-ci-robot/cherry-pick-456-to-release/2.8.0
[release/2.8.0] 添加阿里云lb监听参数校验
2019-05-05 11:28:13 +08:00
ioito
8f78362f86 添加阿里云lb监听参数校验 2019-05-05 03:18:43 +00:00
yunion-ci-robot
48c1ee2f0d Merge pull request #705 from yunion-ci-robot/cherry-pick-690-to-release/2.8.0
[release/2.8.0] fix: 1. ignore yunioncloud temp VMs when syncing 2. start esxi VM on same host with lock
2019-05-02 12:05:14 +08:00
Qiu Jian
7e3aaedec0 fix: 1. ignore yunioncloud temp VMs when syncing 2. start esxi VM on same host with lock 2019-05-02 04:03:24 +00:00
yunion-ci-robot
70742ed01c Merge pull request #704 from yunion-ci-robot/cherry-pick-700-to-release/2.8.0
[release/2.8.0] feature: golang host support linux bridge
2019-05-02 10:42:13 +08:00
wanyaoqi
d5145a8cc3 golang host support linux bridge 2019-05-02 02:37:28 +00:00
yunion-ci-robot
a77c1a6950 Merge pull request #702 from yunion-ci-robot/cherry-pick-671-to-release/2.8.0
[release/2.8.0] 修复腾讯云本地和云上out方向规则为空语义不一致问题
2019-05-01 12:02:15 +08:00
ioito
ecad57c8fe 修复腾讯云本地和云上out方向规则为空语义不一致问题 2019-05-01 03:52:46 +00:00
yunion-ci-robot
72263a207c Merge pull request #697 from yunion-ci-robot/cherry-pick-696-to-release/2.8.0
[release/2.8.0] fix: deploy_configs was removed when invoke SetCreateParams
2019-04-30 16:42:13 +08:00
Zexi
409b702acc fix: deploy_configs was removed when invoke SetCreateParams 2019-04-30 08:25:55 +00:00
yunion-ci-robot
03e2113f68 Merge pull request #694 from yunion-ci-robot/cherry-pick-693-to-release/2.8.0
[release/2.8.0] fix: isolated_device dev_type field not set
2019-04-30 14:33:15 +08:00
Zexi
e67e4c5b85 fix: isolated_device dev_type field not set 2019-04-30 06:30:27 +00:00
yunion-ci-robot
904b371a0b Merge pull request #691 from yunion-ci-robot/cherry-pick-689-to-release/2.8.0
[release/2.8.0] netio&diskio fix
2019-04-30 14:28:13 +08:00
TangBin
4122d5b245 rename addNetio variable name 2019-04-30 02:43:16 +00:00
TangBin
f7c2f06204 netio&diskio fix 2019-04-30 02:43:16 +00:00
yunion-ci-robot
884c7ec2de Merge pull request #688 from swordqiu/automated-cherry-pick-of-#609-upstream-release-2.8.0
Automated cherry pick of #609: fix: 1. network interface for prepaid-recycle VM incorrect 2. aliyun not support import image of RHEL
2019-04-29 17:24:12 +08:00
Qiu Jian
8b36357ed1 update vendor 2019-04-29 14:58:19 +08:00
Qiu Jian
4a5e904623 fix: 1. network interface for prepaid-recycle VM incorrect 2. aliyun not support import image of RHEL 2019-04-29 14:56:51 +08:00
yunion-ci-robot
383bd7f2db Merge pull request #683 from yunion-ci-robot/cherry-pick-679-to-release/2.8.0
[release/2.8.0] bugfix: host register add version record, fix getBmAgentUrl
2019-04-29 14:30:12 +08:00
yunion-ci-robot
3932ffffa2 Merge pull request #686 from yunion-ci-robot/cherry-pick-659-to-release/2.8.0
[release/2.8.0] fix: keep order of network interface for baremetal
2019-04-29 14:27:16 +08:00
Qiu Jian
bea3a87db6 fix: keep order of network interface for baremetal 2019-04-29 06:25:07 +00:00
yunion-ci-robot
fdb597bd2b Merge pull request #681 from yunion-ci-robot/cherry-pick-678-to-release/2.8.0
[release/2.8.0] fix: host convert params to ServerCreateInput
2019-04-29 14:21:13 +08:00
wanyaoqi
06e8906519 host register add version record, fix getBmAgentUrl 2019-04-29 05:38:44 +00:00
Zexi
fde23bbe53 fix: host convert params to ServerCreateInput 2019-04-29 05:36:49 +00:00
yunion-ci-robot
912ac0e5f7 Merge pull request #677 from yunion-ci-robot/cherry-pick-675-to-release/2.8.0
[release/2.8.0] scheduler forecast select_candidate not add count
2019-04-28 21:58:13 +08:00
yunion-ci-robot
649f2d6587 Merge pull request #674 from yunion-ci-robot/cherry-pick-672-to-release/2.8.0
[release/2.8.0] 统一使用const,避免city命名不一致
2019-04-28 21:56:12 +08:00
Zexi
25f6b86396 fix: scheduler forecast select_candidate not add count 2019-04-28 13:55:51 +00:00
ioito
5a87cbfe7f 统一使用const,避免city命名不一致 2019-04-28 07:49:20 +00:00
yunion-ci-robot
2892080fbc Merge pull request #668 from yunion-ci-robot/cherry-pick-665-to-release/2.8.0
[release/2.8.0] 修复未返回templateId
2019-04-27 21:31:16 +08:00
ioito
cd535cfc5f 修复未返回templateId 2019-04-27 13:25:26 +00:00
yunion-ci-robot
519596239c Merge pull request #662 from yunion-ci-robot/cherry-pick-660-to-release/2.8.0
[release/2.8.0] 避免nil指针访问
2019-04-27 17:25:12 +08:00
ioito
487097af5f 避免nil指针访问 2019-04-27 09:21:44 +00:00
yunion-ci-robot
f2dba069c7 Merge pull request #656 from yunion-ci-robot/cherry-pick-600-to-release/2.8.0
[release/2.8.0] OpenStack加入重装系统参数校验
2019-04-26 22:24:20 +08:00
yunion-ci-robot
71624bb31d Merge pull request #654 from yunion-ci-robot/cherry-pick-646-to-release/2.8.0
[release/2.8.0] fix: do not directly manage ESXi host that is managed by vcenter
2019-04-26 21:44:13 +08:00
ioito
a441ec5d44 加入重装系统参数校验 2019-04-26 13:42:44 +00:00
Qiu Jian
e1db1d2df7 fix: do not directly manage ESXi host that is managed by vcenter 2019-04-26 13:19:57 +00:00
yunion-ci-robot
9e831f0144 Merge pull request #650 from yunion-ci-robot/cherry-pick-648-to-release/2.8.0
[release/2.8.0] fix: use db.FetchModelObjects to batch Query objects
2019-04-26 21:08:13 +08:00
Qiu Jian
51de0f311d fix: use db.FetchModelObjects to batch Query objects 2019-04-26 07:46:47 +00:00
yunion-ci-robot
49c84f9332 Merge pull request #644 from Zexi/automated-cherry-pick-of-#611-upstream-release-2.8.0
Automated cherry pick of #611: baremetal schedule net bonding check
2019-04-26 02:09:14 +08:00
yunion-ci-robot
b1a87c0d13 Merge pull request #643 from yunion-ci-robot/cherry-pick-634-to-release/2.8.0
[release/2.8.0] 手动同步的也更新last_auto_sync时间
2019-04-26 02:08:13 +08:00
yunion-ci-robot
0f320e3b14 Merge pull request #638 from yunion-ci-robot/cherry-pick-628-to-release/2.8.0
[release/2.8.0] Azure: 修复因系统盘大小导致重装系统失败
2019-04-26 02:06:11 +08:00
Zexi
e123f57a5e baremetal schedule net bonding check 2019-04-26 02:02:41 +08:00
ioito
d4768e57f6 手动同步的也更新last_auto_sync时间 2019-04-25 16:42:57 +00:00
ioito
a4159de9ae Azure: 修复因系统盘大小导致重装系统失败 2019-04-25 16:41:28 +00:00
yunion-ci-robot
4381069012 Merge pull request #636 from yunion-ci-robot/cherry-pick-633-to-release/2.8.0
[release/2.8.0] 避免返回不是id not found,导致network一直删除失败
2019-04-26 00:41:14 +08:00
ioito
ac779027da 避免返回不是id not found,导致network一直删除失败 2019-04-25 16:39:48 +00:00
yunion-ci-robot
f10467abaf Merge pull request #630 from yunion-ci-robot/cherry-pick-624-to-release/2.8.0
[release/2.8.0] cloud-init users支持加上default
2019-04-25 21:49:12 +08:00
ioito
3f9184dc19 cloud-init users支持加上default 2019-04-25 13:29:53 +00:00
yunion-ci-robot
2117d788b8 Merge pull request #626 from yunion-ci-robot/cherry-pick-610-to-release/2.8.0
[release/2.8.0] 避免同步时删除vpc失败,导致不同步vpc底下资源
2019-04-25 21:04:18 +08:00
ioito
65612585d2 避免同步时删除vpc失败,导致不同步vpc底下资源 2019-04-25 12:52:01 +00:00
yunion-ci-robot
e057610a5a Merge pull request #618 from yunion-ci-robot/cherry-pick-613-to-release/2.8.0
[release/2.8.0] Azure: 修复虚拟机时未设置keypair路径
2019-04-25 19:00:14 +08:00
ioito
443406099d Azure: 修复虚拟机时未设置keypair路径 2019-04-25 10:49:48 +00:00
yunion-ci-robot
c9d67e8c94 Merge pull request #616 from yunion-ci-robot/cherry-pick-608-to-release/2.8.0
[release/2.8.0] huawei import keypair & rebuild root & skus filter fix
2019-04-25 18:49:15 +08:00
TangBin
2a3cbbc1fa huawei import keypair & rebuild root & skus filter fix 2019-04-25 10:41:45 +00:00
yunion-ci-robot
5630c660ff Merge pull request #606 from Zexi/automated-cherry-pick-of-#605-upstream-release-2.8.0
Automated cherry pick of #605: fix: baremetal server deploy auto restart not work
2019-04-25 11:09:11 +08:00
Zexi
8bdc2a6efc fix: baremetal server deploy auto restart not work 2019-04-25 10:54:46 +08:00
yunion-ci-robot
c60c8b7cc8 Merge pull request #602 from yunion-ci-robot/cherry-pick-586-to-release/2.8.0
[release/2.8.0] 支持批量添加标签api
2019-04-24 23:01:13 +08:00
ioito
e5038f2f24 支持批量添加标签api 2019-04-24 14:58:57 +00:00
yunion-ci-robot
52d0dbd9ee Merge pull request #598 from yunion-ci-robot/cherry-pick-577-to-release/2.8.0
[release/2.8.0] Azure重装系统支持初始化密码
2019-04-24 22:25:14 +08:00
yunion-ci-robot
a6dafe0db6 Merge pull request #599 from wanyaoqi/automated-cherry-pick-of-#585-upstream-release-2.8.0
Automated cherry pick of #585: import from libvirt link disk, do not move
2019-04-24 22:23:15 +08:00
wanyaoqi
42160dec5d import from libvirt link disk, do not move 2019-04-24 22:15:46 +08:00
ioito
e8eec6cf40 修复typo错误 2019-04-24 14:13:58 +00:00
ioito
358bd695b2 重装系统支持初始化密码 2019-04-24 14:13:58 +00:00
yunion-ci-robot
597b4720fd Merge pull request #592 from Zexi/automated-cherry-pick-of-#591-upstream-release-2.8.0
Automated cherry pick of #591: fix: prepaid recycle host not check storage types
2019-04-24 20:58:13 +08:00
yunion-ci-robot
29f2d5b7d0 Merge pull request #594 from swordqiu/automated-cherry-pick-of-#406-upstream-release-2.8.0
Automated cherry pick of #406: Feature: host support centos 6
2019-04-24 19:56:11 +08:00
Qiu Jian
39f9b1f1a9 abondon code change to pkg/hostman/storageman/imagecachemanager_local.go 2019-04-24 19:50:53 +08:00
Qiu Jian
6f5d02c727 Feature: host support centos 6 2019-04-24 19:49:42 +08:00
Zexi
e68b8e5f58 fix: prepaid recycle host not check storage types 2019-04-24 19:38:26 +08:00
yunion-ci-robot
44e2c1de21 Merge pull request #590 from yunion-ci-robot/cherry-pick-587-to-release/2.8.0
[release/2.8.0] fix: validate baremetal raid config
2019-04-24 18:44:12 +08:00
Zexi
1b015c6a46 fix: validate baremetal raid config 2019-04-24 10:41:46 +00:00
yunion-ci-robot
9f60a96013 Merge pull request #583 from yunion-ci-robot/cherry-pick-581-to-release/2.8.0
[release/2.8.0] fix: baremetal server create params not override disks
2019-04-24 12:19:13 +08:00
Zexi
9df7b8b4ff fix: baremetal server create params not override disks 2019-04-24 04:13:40 +00:00
yunion-ci-robot
7cd0ad4b46 Merge pull request #579 from yunion-ci-robot/cherry-pick-578-to-release/2.8.0
[release/2.8.0] 新增编译:host baremetal-agent 两个 rpm
2019-04-24 10:11:11 +08:00
Zhang Dongliang
0fdc35df66 新增编译:host baremetal-agent 两个 rpm 2019-04-24 02:08:45 +00:00
yunion-ci-robot
321be13a75 Merge pull request #576 from yunion-ci-robot/cherry-pick-558-to-release/2.8.0
[release/2.8.0] fix: convert billingcycle to aliyun renew period error
2019-04-23 17:34:12 +08:00
Qiu Jian
6a3296160b fix: convert billingcycle to aliyun renew period error 2019-04-23 09:31:42 +00:00
yunion-ci-robot
186c12e1cc Merge pull request #571 from yunion-ci-robot/cherry-pick-557-to-release/2.8.0
[release/2.8.0] feature: server migrate add auto start
2019-04-23 17:28:12 +08:00
yunion-ci-robot
20c0207c16 Merge pull request #573 from yunion-ci-robot/cherry-pick-549-to-release/2.8.0
[release/2.8.0] Bugfix/ningyu meteralert project support
2019-04-23 17:27:11 +08:00
yunion-ci-robot
5bfc004689 Merge pull request #570 from ioito/automated-cherry-pick-of-#535-upstream-release-2.8.0
Automated cherry pick of #535: 同步公有云资源创建时间
2019-04-23 17:12:15 +08:00
ningyu
4515e41204 fix: 余额/消费报警引入了项目归属的概念,在创建、列出规则时都需要指定是哪个项目 2019-04-23 09:01:48 +00:00
yunion-ci-robot
98853e18f4 Merge pull request #566 from wanyaoqi/automated-cherry-pick-of-#530-upstream-release-2.8.0
Automated cherry pick of #530: fix guest resume on migrate failed, fix snapshot action log
2019-04-23 16:59:11 +08:00
yunion-ci-robot
c5363ba902 Merge pull request #567 from yunion-ci-robot/cherry-pick-477-to-release/2.8.0
[release/2.8.0] aws rebuild root ignore password/key
2019-04-23 16:57:12 +08:00
wanyaoqi
24e91ca0d9 server migrate add auto start 2019-04-23 08:49:42 +00:00
ioito
dcfd2e950d 同步公有云资源创建时间 2019-04-23 16:49:26 +08:00
tangbin
e8382fea55 string format bugfix 2019-04-23 08:43:27 +00:00
TangBin
622c97f4b4 aws rebuild root ignore password/key 2019-04-23 08:43:27 +00:00
wanyaoqi
6ca97ef540 fix guest resume on migrate failed, fix snapshot action log 2019-04-23 16:43:07 +08:00
yunion-ci-robot
8f882b50fc Merge pull request #561 from yunion-ci-robot/cherry-pick-536-to-release/2.8.0
[release/2.8.0] bugfix: fix aliyun snapshot delete failed, delete linked images first
2019-04-23 16:36:11 +08:00
yunion-ci-robot
2b63fbc873 Merge pull request #559 from yunion-ci-robot/cherry-pick-537-to-release/2.8.0
[release/2.8.0] ip子网支持city过滤
2019-04-23 16:35:11 +08:00
wanyaoqi
b4f036f801 fix aliyun snapshot delete failed, delete linked images first 2019-04-23 08:30:28 +00:00
ioito
b5a79c7581 ip子网支持city过滤 2019-04-23 08:25:22 +00:00
yunion-ci-robot
2aabaf4129 Merge pull request #552 from yunion-ci-robot/cherry-pick-550-to-release/2.8.0
[release/2.8.0] 修复azure拼写错误
2019-04-23 15:29:12 +08:00
yunion-ci-robot
2f6009d1d2 Merge pull request #556 from yunion-ci-robot/cherry-pick-538-to-release/2.8.0
[release/2.8.0] bugfix: fix query networks not set model manager
2019-04-23 14:13:12 +08:00
wanyaoqi
cbf1f63c14 fix query networks not set model manager 2019-04-23 06:11:02 +00:00
ioito
170be67314 修复azure拼写错误 2019-04-23 05:54:49 +00:00
yunion-ci-robot
49602bd398 Merge pull request #544 from yunion-ci-robot/cherry-pick-539-to-release/2.8.0
[release/2.8.0] loadbalancernetwork: 支持lbnetwork-list --details
2019-04-22 23:34:14 +08:00
yunion-ci-robot
dc31e0b4cf Merge pull request #547 from yunion-ci-robot/cherry-pick-540-to-release/2.8.0
[release/2.8.0] fix: domain-config-update rpc method panic
2019-04-22 23:32:13 +08:00
Zexi
3ecf14af2f fix: domain-config-update rpc method panic 2019-04-22 15:03:52 +00:00
Yousong Zhou
da2ddb3b95 loadbalancernetwork: 支持lbnetwork-list --details 2019-04-22 15:02:55 +00:00
yunion-ci-robot
0d6bc4fae6 Merge pull request #533 from yunion-ci-robot/cherry-pick-531-to-release/2.8.0
[release/2.8.0] 避免qcloud password和keypair冲突
2019-04-22 15:12:11 +08:00
ioito
44c942a1c0 避免qcloud password和keypair冲突 2019-04-22 06:52:48 +00:00
yunion-ci-robot
c6ef26b814 Merge pull request #529 from yunion-ci-robot/cherry-pick-475-to-release/2.8.0
[release/2.8.0] guest start monitor on sync status
2019-04-22 10:54:11 +08:00
wanyaoqi
5445a1c14b guest start monitor on sync status 2019-04-22 02:46:26 +00:00
yunion-ci-robot
d73312fce8 Merge pull request #528 from yunion-ci-robot/cherry-pick-526-to-release/2.8.0
[release/2.8.0] fix: automatically purge removed servers on public cloud
2019-04-22 10:43:11 +08:00
Qiu Jian
dffde5187e fix: automatically purge removed servers on public cloud 2019-04-22 02:33:24 +00:00
yunion-ci-robot
d15ad9836a Merge pull request #527 from yunion-ci-robot/cherry-pick-524-to-release/2.8.0
[release/2.8.0] fix: delete servers that has been removed results in delete_failed status
2019-04-22 10:15:11 +08:00
Qiu Jian
ce41a55f1a fix: delete servers that has been removed results in delete_failed status 2019-04-22 01:56:27 +00:00
yunion-ci-robot
edb2b480d7 Merge pull request #523 from yunion-ci-robot/cherry-pick-522-to-release/2.8.0
[release/2.8.0] 修复OpenStack更改配置失败问题
2019-04-20 22:44:11 +08:00
ioito
4790b40602 避免与INSTANCE_STATUS_VERIFY_RESIZE与INSTANCE_STATUS_RESIZE状一样,导致状态未到INSTANCE_STATUS_VERIFY_RESIZE时发送确认请求 2019-04-20 13:38:24 +00:00
yunion-ci-robot
38b37b3f19 Merge pull request #521 from yunion-ci-robot/cherry-pick-520-to-release/2.8.0
[release/2.8.0] 修正openstack状态
2019-04-20 20:00:12 +08:00
ioito
1105c2381a 修正openstack状态 2019-04-20 11:54:30 +00:00
yunion-ci-robot
4201b4d536 Merge pull request #519 from yunion-ci-robot/cherry-pick-518-to-release/2.8.0
[release/2.8.0] fix: cloud-account sync ignore db failure
2019-04-20 18:58:11 +08:00
Qiu Jian
da83c1a652 fix: cloud-account sync ignore db failure 2019-04-20 10:52:25 +00:00
yunion-ci-robot
7b6837045e Merge pull request #517 from yunion-ci-robot/cherry-pick-516-to-release/2.8.0
[release/2.8.0] fix: esxi server skus return empty results
2019-04-20 18:07:11 +08:00
Qiu Jian
6b732d87de fix: esxi server skus return empty results 2019-04-20 10:05:23 +00:00
yunion-ci-robot
5e128d0f8a Merge pull request #515 from yunion-ci-robot/cherry-pick-514-to-release/2.8.0
[release/2.8.0] fix: cloud account/provider missing event logs for delete/enable/disable/change_project
2019-04-20 17:18:11 +08:00
Qiu Jian
45f219008b fix: cloud account/provider missing event logs for delete/enable/disable/change_project 2019-04-20 09:16:24 +00:00
yunion-ci-robot
c6524750ba Merge pull request #513 from yunion-ci-robot/cherry-pick-503-to-release/2.8.0
[release/2.8.0] fix instance spec list query cache error
2019-04-20 17:10:12 +08:00
TangBin
f371a540fb optimaze QueryRelatedRegionIds 2019-04-20 09:07:27 +00:00
TangBin
2a0aa1e426 fix skus & zone-list & cloud-region-list query with params manager&account 2019-04-20 09:07:27 +00:00
TangBin
65cee8b1a4 修复实例规格列表缓存key错误&修复cloudregion manager过滤查询错误 2019-04-20 09:07:27 +00:00
yunion-ci-robot
9bc43c9a77 Merge pull request #512 from yunion-ci-robot/cherry-pick-509-to-release/2.8.0
[release/2.8.0] fix: create server with iso failed
2019-04-20 16:16:11 +08:00
yunion-ci-robot
a29d3836a2 Merge pull request #511 from yunion-ci-robot/cherry-pick-510-to-release/2.8.0
[release/2.8.0] feature: new host spec
2019-04-20 16:15:11 +08:00
Qiu Jian
3d0e63bba4 fix: create server with iso failed 2019-04-20 08:12:31 +00:00
Zexi
22980387c3 feature: new host spec 2019-04-20 08:10:32 +00:00
yunion-ci-robot
cb67571b06 Merge pull request #508 from yunion-ci-robot/cherry-pick-507-to-release/2.8.0
[release/2.8.0] fix: server-create-params network boding config
2019-04-20 15:17:14 +08:00
Zexi
5a6cc00bbc fix: server-create-params network boding config 2019-04-20 06:59:30 +00:00
yunion-ci-robot
a46f579da9 Merge pull request #506 from yunion-ci-robot/cherry-pick-505-to-release/2.8.0
[release/2.8.0] allow list hosts by hypervisor
2019-04-20 12:49:12 +08:00
Qiu Jian
fe453d2121 allow list hosts by hypervisor 2019-04-20 04:48:28 +00:00
yunion-ci-robot
6a5c3ba7e8 Merge pull request #504 from Zexi/hotfix/create-backup-server-panic
fix: create backup server panic
2019-04-20 12:06:10 +08:00
Zexi
4cc0e38d15 fix: create backup server panic 2019-04-20 11:58:01 +08:00
yunion-ci-robot
a3d0ad0f7e Merge pull request #500 from yunion-ci-robot/cherry-pick-489-to-release/2.8.0
[release/2.8.0] 腾讯云要求vpc掩码范围需在16 - 28之间
2019-04-19 20:31:10 +08:00
ioito
e19b1a2db2 腾讯云要求vpc掩码范围需在16 - 28之间 2019-04-19 12:07:41 +00:00
yunion-ci-robot
b72e37f69c Merge pull request #497 from yunion-ci-robot/cherry-pick-493-to-release/2.8.0
[release/2.8.0] 避免因ceph存储阻塞host 服务启动
2019-04-19 20:07:19 +08:00
ioito
761f7b4b95 添加连接ceph超时时间 2019-04-19 12:02:28 +00:00
ioito
1d25fd45e9 忽略rbd错误,并将rbd storage置为离线 2019-04-19 12:02:28 +00:00
yunion-ci-robot
8e157fcfa5 Merge pull request #494 from yunion-ci-robot/cherry-pick-491-to-release/2.8.0
[release/2.8.0] fix: skip quota check in server validateupdatedata if cpu and mem not updated
2019-04-19 17:22:13 +08:00
Qiu Jian
1a5c0e11dd fix: skip quota check in server validateupdatedata if cpu and mem not updated 2019-04-19 08:52:27 +00:00
yunion-ci-robot
1d7d4cbdd4 Merge pull request #488 from yunion-ci-robot/cherry-pick-487-to-release/2.8.0
[release/2.8.0] 避免标签为空时,未返回{data:[]}结构
2019-04-19 13:34:10 +08:00
yunion-ci-robot
fa7a9c37cb Merge pull request #492 from yunion-ci-robot/cherry-pick-490-to-release/2.8.0
[release/2.8.0] fix: add cloud_env filter of private_or_onpremise
2019-04-19 13:23:11 +08:00
Qiu Jian
92fc2cf029 fix: add cloud_env filter of private_or_onpremise 2019-04-19 04:45:23 +00:00
ioito
266e66c41d 避免标签为空时,未返回{data:[]}结构 2019-04-19 03:53:23 +00:00
yunion-ci-robot
5dff7d0b2b Merge pull request #485 from yunion-ci-robot/cherry-pick-474-to-release/2.8.0
[release/2.8.0] 避免一些公有云重装系统后数据未刷新导致任务失败
2019-04-19 00:45:12 +08:00
ioito
6914f74dbd 避免一些公有云重装系统后数据未刷新导致任务失败 2019-04-18 15:09:28 +00:00
yunion-ci-robot
ea7d81091f Merge pull request #482 from yunion-ci-robot/cherry-pick-476-to-release/2.8.0
[release/2.8.0] 避免创建Windows时使用linux格式的userData
2019-04-18 22:37:15 +08:00
ioito
e466b85bad 避免创建Windows时使用linux格式的userData 2019-04-18 14:24:31 +00:00
yunion-ci-robot
d212436c2b Merge pull request #481 from yunion-ci-robot/cherry-pick-480-to-release/2.8.0
[release/2.8.0] fix metadata handler not return
2019-04-18 19:39:11 +08:00
wanyaoqi
4c9ea8e802 fix metadata handler not return 2019-04-18 11:35:22 +00:00
yunion-ci-robot
8b730e6000 Merge pull request #479 from yunion-ci-robot/cherry-pick-478-to-release/2.8.0
[release/2.8.0] feature: mcclient spec modules add rpc method
2019-04-18 18:50:10 +08:00
Zexi
4a43f55c06 feature: mcclient spec modules add rpc method 2019-04-18 10:48:30 +00:00
yunion-ci-robot
21c085aee6 Merge pull request #473 from yunion-ci-robot/cherry-pick-470-to-release/2.8.0
[release/2.8.0] sync sku to scheduler
2019-04-18 15:30:13 +08:00
TangBin
97a37c4f47 fix import 2019-04-18 07:27:25 +00:00
TangBin
84b829ef5c sync sku to scheduler 2019-04-18 07:27:25 +00:00
yunion-ci-robot
b9692c6b51 Merge pull request #468 from yunion-ci-robot/cherry-pick-457-to-release/2.8.0
[release/2.8.0] Bugfix/yousong enhance db tasks
2019-04-18 14:25:11 +08:00
yunion-ci-robot
36aacf5365 Merge pull request #472 from yunion-ci-robot/cherry-pick-452-to-release/2.8.0
[release/2.8.0] 兼容标签返回结构
2019-04-18 14:01:10 +08:00
ioito
1498ea2c5f 兼容标签返回结构 2019-04-18 05:55:27 +00:00
yunion-ci-robot
7cf37a6e27 Merge pull request #469 from wanyaoqi/automated-cherry-pick-of-#408-upstream-release-2.8.0
Automated cherry pick of #408: 1. server export to libvirt generate virt install script 2. fix server import from libvirt
2019-04-18 11:36:13 +08:00
wanyaoqi
5b18ec8111 fix guest concurrent start, add start work 2019-04-18 11:11:25 +08:00
wanyaoqi
809f97ca8b qemu add serial device, fix system service detect os 2019-04-18 11:06:54 +08:00
wanyaoqi
1cc637d629 1. server export to libvirt generate virt install script 2. fix server import from libvirt 2019-04-18 11:06:23 +08:00
Yousong Zhou
3f0becad4b tasks: 改善查询语句
- 索引简化,obj_id的区分度非常高,且在QueryTasksOfObject()等相关的查询中是确定出现的
   - obj_name可认为被obj_id唯一确定
   - created_at若出现可假设被MySQL Index Merge优化
   - stage的值是可枚举的
 - Join taskobjects_tbl时,避免使用子查询查全表
 - 使用Union合并两个查询结果
2019-04-18 02:57:34 +00:00
Yousong Zhou
7174a29060 vendor: 更新yunion.io/x/sqlchemy 2019-04-18 02:57:34 +00:00
yunion-ci-robot
db7a9d9dc1 Merge pull request #465 from yunion-ci-robot/cherry-pick-463-to-release/2.8.0
[release/2.8.0] fix: image status should be converting after upload
2019-04-17 23:40:13 +08:00
Qiu Jian
859f5407b2 fix: 1. image status should be converting after upload 2. move consts to apis 3. add image-event command 2019-04-17 15:26:32 +00:00
yunion-ci-robot
44c339b7a7 Merge pull request #464 from yunion-ci-robot/cherry-pick-454-to-release/2.8.0
[release/2.8.0] Add unified cloud provider and env filter for any resource list
2019-04-17 23:15:11 +08:00
yunion-ci-robot
513af78e7d Merge pull request #460 from yunion-ci-robot/cherry-pick-450-to-release/2.8.0
[release/2.8.0] fix: 1. force use qcow2 format when creating kvm VM 2. add template lock
2019-04-17 23:05:11 +08:00
yunion-ci-robot
e3858744b5 Merge pull request #459 from yunion-ci-robot/cherry-pick-449-to-release/2.8.0
[release/2.8.0] 添加EIP操作相关日志记录
2019-04-17 23:04:15 +08:00
Qiu Jian
d816425670 Add unified cloud provider and env filter for any resource list 2019-04-17 15:02:35 +00:00
Qiu Jian
f5c7c3ac8b fix: 1. force use qcow2 format when creating kvm VM 2. add template lock 2019-04-17 14:34:35 +00:00
yunion-ci-robot
2752d36026 Merge pull request #458 from yunion-ci-robot/cherry-pick-423-to-release/2.8.0
[release/2.8.0] fix: region statusstandalone resource get status api missing
2019-04-17 22:34:17 +08:00
ioito
ac56b6b0d3 修正拼写错误 2019-04-17 14:30:40 +00:00
ioito
366a551a6b 添加eip相关日志记录 2019-04-17 14:30:39 +00:00
Zexi
7215fe72ab fix: region statusstandalone resource get status api missing 2019-04-17 14:25:31 +00:00
yunion-ci-robot
1b954d5e47 Merge pull request #455 from Zexi/automated-cherry-pick-of-#453-upstream-release-2.8.0
Automated cherry pick of #453: 改进调度器 disk 选择 storage 的逻辑:
2019-04-17 18:51:10 +08:00
Zexi
775b80b117 改进调度器 disk 选择 storage 的逻辑:
- 调度器选择 disk 对应一组 storages
- 主备机磁盘选择 storage
- 减少公有云选择 storage 的重复代码
2019-04-17 18:48:38 +08:00
yunion-ci-robot
ba841b675d Merge pull request #451 from yunion-ci-robot/cherry-pick-448-to-release/2.8.0
[release/2.8.0] hide some server metadata
2019-04-17 17:36:10 +08:00
Zexi
37269f4282 hide some server metadata 2019-04-17 08:28:28 +00:00
yunion-ci-robot
a0a64128e2 Merge pull request #447 from yunion-ci-robot/cherry-pick-441-to-release/2.8.0
[release/2.8.0] fix: 创建公有云虚拟机保留镜像原密码功能失效
2019-04-17 14:33:10 +08:00
yunion-ci-robot
4ba0992cc6 Merge pull request #446 from yunion-ci-robot/cherry-pick-426-to-release/2.8.0
[release/2.8.0] webconsole支持指定端口ssh连接
2019-04-17 14:28:11 +08:00
Zexi
0488734442 fix: 创建公有云虚拟机保留镜像原密码功能失效 2019-04-17 06:27:27 +00:00
yunion-ci-robot
22312f27b6 Merge pull request #443 from yunion-ci-robot/cherry-pick-442-to-release/2.8.0
[release/2.8.0] 避免阿里云lb参数校验循环调用
2019-04-17 14:25:13 +08:00
屈轩
8e56c653cd webconsole支持指定端口ssh连接 2019-04-17 05:48:27 +00:00
ioito
81258a7034 修复lb参数校验异常问题 2019-04-17 05:46:26 +00:00
yunion-ci-robot
47daa3afa2 Merge pull request #440 from yunion-ci-robot/cherry-pick-439-to-release/2.8.0
[release/2.8.0] fix: region sku consts undefined
2019-04-17 12:27:11 +08:00
Zexi
bea5503b12 fix: region sku consts undefined 2019-04-17 04:26:22 +00:00
yunion-ci-robot
3d228a087b Merge pull request #436 from yunion-ci-robot/cherry-pick-429-to-release/2.8.0
[release/2.8.0] 优化返回标签结构
2019-04-17 12:24:10 +08:00
yunion-ci-robot
fd4d070197 Merge pull request #435 from yunion-ci-robot/cherry-pick-417-to-release/2.8.0
[release/2.8.0] instance spec query add cache
2019-04-17 12:23:10 +08:00
yunion-ci-robot
a336ae95c3 Merge pull request #437 from Zexi/automated-cherry-pick-of-#430-upstream-release-2.8.0
Automated cherry pick of #430: fix: move all consts in compute/models to apis/compute
2019-04-17 11:18:12 +08:00
Zexi
36ed3bcc97 fix: ucloud eip wrong log Warning invoke 2019-04-17 11:13:33 +08:00
Qiu Jian
4becca44c8 fix: move all consts in compute/models to apis/compute 2019-04-17 11:10:25 +08:00
ioito
230eac1e64 添加返回distinct标签 2019-04-17 02:31:22 +00:00
TangBin
93185d5008 only list vpc usable skus 2019-04-17 02:28:21 +00:00
TangBin
e314b6716e instance spec query add cache 2019-04-17 02:28:21 +00:00
yunion-ci-robot
0232f9261d Merge pull request #434 from yunion-ci-robot/cherry-pick-427-to-release/2.8.0
[release/2.8.0] Hotfix/qj fix cloudcommon policy test error
2019-04-17 10:23:10 +08:00
Qiu Jian
dde6c3d93b fix: pkg/cloudcommon/policy/ go test failure 2019-04-17 02:18:25 +00:00
Qiu Jian
ad1bbf03c1 update vendor and Gopkg.lock 2019-04-17 02:18:25 +00:00
yunion-ci-robot
da235b4c75 Merge pull request #433 from yunion-ci-robot/cherry-pick-431-to-release/2.8.0
[release/2.8.0] fix: cloud account sync status not accurate
2019-04-17 10:09:10 +08:00
Qiu Jian
60c31c5767 fix: cloud account sync status not accurate 2019-04-17 01:58:20 +00:00
yunion-ci-robot
c91bf5cab3 Merge pull request #432 from yunion-ci-robot/cherry-pick-428-to-release/2.8.0
[release/2.8.0] fix: region usage guest 统计数量包括 host disabled
2019-04-17 09:14:09 +08:00
Zexi
a5ab591b02 fix: region usage guest 统计数量包括 host disabled 2019-04-16 18:05:23 +00:00
yunion-ci-robot
8b03dde1f1 Merge pull request #425 from yunion-ci-robot/cherry-pick-424-to-release/2.8.0
[release/2.8.0] fix: capabilitie api duplicate info
2019-04-16 20:43:11 +08:00
yunion-ci-robot
e5d9fb683f Merge pull request #420 from yunion-ci-robot/cherry-pick-419-to-release/2.8.0
[release/2.8.0] 避免OpenStack不支持安全组部署失败
2019-04-16 20:42:10 +08:00
Zexi
66d6c4a5a9 fix: capabilitie api duplicate info 2019-04-16 12:34:24 +00:00
屈轩
8b51115482 避免OpenStack不支持安全组部署失败 2019-04-16 10:54:22 +00:00
yunion-ci-robot
f4d88836d4 Merge pull request #416 from yunion-ci-robot/cherry-pick-415-to-release/2.8.0
[release/2.8.0] fix: cloud account queued sync_status is override as idle
2019-04-16 01:00:14 +08:00
Qiu Jian
f2a65ed203 fix: cloud account queued sync_status is overried as idle 2019-04-15 16:54:21 +00:00
yunion-ci-robot
c5d47bb685 Merge pull request #413 from yunion-ci-robot/cherry-pick-402-to-release/2.8.0
[release/2.8.0] Hotfix/qx auto sync time
2019-04-15 18:24:09 +08:00
屈轩
e3717bf94e typo 2019-04-15 10:15:24 +00:00
屈轩
723ed46a88 加入自动同步时间字段 2019-04-15 10:15:24 +00:00
yunion-ci-robot
5999e2cd78 Merge pull request #412 from yunion-ci-robot/cherry-pick-404-to-release/2.8.0
[release/2.8.0] fix: capability 接口没有考虑 cloudaccount 的禁用情况
2019-04-15 18:15:10 +08:00
Zexi
368c71a9b3 fix: capability 接口没有考虑 cloudaccount 的禁用情况 2019-04-15 10:00:26 +00:00
yunion-ci-robot
3129e099e1 避免创建不受支持的loadbalancer (#409) 2019-04-15 16:02:09 +08:00
Zexi Li
e59056cc13 Automated cherry pick of #168: 优化scheduler缓存 #380: fix: scheduler sku cache stale when region sync sku finished (#397)
* 优化scheduler缓存的sku数据

* fix: scheduler sku cache stale when region sync sku finished
2019-04-15 15:49:14 +08:00
yunion-ci-robot
da01d6b814 [release/2.8.0] Bugfix/tb sku fix (#394)
* sku filter fix

* change aws default secgroup name

* sku provider filter fix
2019-04-15 15:47:10 +08:00
yunion-ci-robot
19203236fb Websockets 不再拉取 ActionLog 的消息 (#407) 2019-04-15 15:26:10 +08:00
yunion-ci-robot
9879f1b702 fix: scheduler forecast backup server not work (#405) 2019-04-15 15:19:09 +08:00
yunion-ci-robot
b7fe4edf89 [release/2.8.0] 为 climc 增加 update-perform --cmp-only 选项,只升级计算节点 (#400)
* 为 climc 增加 update-perform --cmd-only 选项,只升级计算节点; 2个选项 只允许选择其中1个

* minor
2019-04-15 12:02:09 +08:00
yunion-ci-robot
e585e3bbe6 fix: server create params isolated device config no vendor and device type info (#393) 2019-04-13 22:03:09 +08:00
yunion-ci-robot
462d670e75 [release/2.8.0] Hotfix/qx lb manager (#392)
* 设置lb manager_id

* 公有云真删除model
2019-04-13 21:44:11 +08:00
yunion-ci-robot
eca8de6cbd 磁盘大小向上取整 (#389) 2019-04-13 21:31:09 +08:00
yunion-ci-robot
079df200e7 [release/2.8.0] Hotfix/qx cloudprovider info (#386)
* 通用返回cloudprovider info信息

* 通用返回cloudprovider info信息
2019-04-13 20:14:12 +08:00
yunion-ci-robot
e17ca3375b lb: https: allow change certificate (#381) 2019-04-13 19:46:09 +08:00
yunion-ci-robot
b7bb52ebea lb: 改正预删listener时未预删listener rule (#374) 2019-04-13 00:51:10 +08:00
yunion-ci-robot
d5e2fb767f [release/2.8.0] Bugfix/yousong lb delete (#372)
* lb: 修复backend group删除时未删backend

* lb: 预删子资源时排除掉已预删的资源

* lb: s/PreDeleteSubs/pendingDeleteSubs/
2019-04-13 00:31:10 +08:00
yunion-ci-robot
b344d39c94 [release/2.8.0] fix: fail to delete removed cloud resources (#369)
* fix: fail to delete removed cloud resources

* fix: private_cloud and on_premise filter overlaps

* fix: loadbalancer* should use pending_delete to remove resources
2019-04-12 21:19:11 +08:00
yunion-ci-robot
0e0c976858 移除重复代码 (#361) 2019-04-12 17:04:12 +08:00
yunion-ci-robot
e3cb042a7d 增加判断subtask准确度 (#356) 2019-04-12 16:07:11 +08:00
yunion-ci-robot
9cef9f2e78 避免eip未找到时,未设置server状态为fail (#353) 2019-04-12 14:38:10 +08:00
yunion-ci-robot
f855e3dafd fix: baremetal scheduler forecast fail (#351) 2019-04-12 12:36:09 +08:00
yunion-ci-robot
4e05c29cb2 fix: baremetal support options for tftp timeout retry times and block size (#345) 2019-04-11 22:13:14 +08:00
yunion-ci-robot
bf6d708cb0 fix: webconsole vmrc protocol not support (#343) 2019-04-11 15:03:09 +08:00
yunion-ci-robot
551dee0f78 fix: esxi ignore check file failure in host.getIStoragecache (#340) 2019-04-11 15:00:10 +08:00
yunion-ci-robot
6456d8d7c4 fix: fail to fetch private image as admin role (#337) 2019-04-11 13:52:10 +08:00
Jian Qiu
f89e04457e fix: server-deploy fail to set password if reset_password not set (#331) 2019-04-10 23:21:13 +08:00
yunion-ci-robot
5b29da94ff fix: create disk input need storage_id in JSON object (#329) 2019-04-10 21:41:13 +08:00
yunion-ci-robot
85da3e0371 fix: limit baremetal tftp MaxBlockSize to 512 (#323) 2019-04-10 18:28:10 +08:00
yunion-ci-robot
aea2dff4cc bugfix: fix server-change-config prase disks config error fix server deploy change password (#321) 2019-04-10 16:38:09 +08:00
yunion-ci-robot
1e96cf7f8a fix: add server create-params region and zone info (#319) 2019-04-10 15:06:08 +08:00
yunion-ci-robot
f0ed3d5575 避免guest状态出现中间ready的情况 (#311) 2019-04-10 12:36:10 +08:00
yunion-ci-robot
a6a6ed4986 fix: 1. baremetal always boot from pxe 2. baremetal prepare retry multiple local ipmi address (#315) 2019-04-10 11:55:09 +08:00
yunion-ci-robot
284bf7795f lblistener: 检查更新参数时默认使用已绑定acl (#308)
避免报missing acl argument错误
2019-04-10 11:18:10 +08:00
yunion-ci-robot
1771ba8587 避免net_desc为空未进行错误处理,避免network没有IP地址 (#304) 2019-04-09 22:37:26 +08:00
Jian Qiu
c71b78f843 Automated cherry pick of #283: fix: make cloud account&provider enable status more (#287)
* fix: make cloud account&provider enable status more consistent

* comment out FetchCustomizeColumns debug info

* fix: cloud account periodic probe should not relay on enabled status

* misc bug fixes
2019-04-09 22:13:10 +08:00
yunion-ci-robot
63478bc456 baremetal-agent: fix host undo convert duplicate access_mac error (#301) 2019-04-09 21:13:08 +08:00
yunion-ci-robot
ac51780b17 fix: server clone 参数处理扩容情况 (#299) 2019-04-09 18:30:10 +08:00
yunion-ci-robot
0702d97fe5 fix: scheduler disk schedtag filter host type not convert to guest hypervisor (#297) 2019-04-09 17:07:09 +08:00
屈轩
0a35748602 避免未setstorageinfo之前连接ceph集群 (#291) 2019-04-09 16:41:13 +08:00
Zexi Li
2841cf1b3f Automated cherry pick of #74: vm clone #167: region: save server create params into metadata #270: region: enhance server clone releated apis (#288)
* vm clone

* region: save server create params into metadata

* region: enhance server clone releated apis

* fix guestCdrom params missing
2019-04-09 12:18:31 +08:00
tb365
7a2bdb96cd Automated cherry pick of #245: huawei test bugfix (#286)
* huawei test bugfix

* add WaitStatusWithDelay method
2019-04-09 11:04:32 +08:00
Zexi Li
5a5133a6b9 fix: scheduler network predicate not set capability when host filtered (#280) 2019-04-08 22:35:41 +08:00
Zexi Li
f804f40299 fix: host 内存规格信息直接为 MB (#282) 2019-04-08 22:27:34 +08:00
Zexi Li
f125525805 fix: scheduler schedtag filters execute when candidates specified (#278) 2019-04-08 22:24:33 +08:00
Jian Qiu
1b9e3f6ad9 Feature: allow delete cloud-account with resources (#253) 2019-04-08 22:04:33 +08:00
屈轩
9f3d940a90 修复选择endpoint type异常错误 (#267) 2019-04-08 21:08:34 +08:00
wanyaoqi
79ebe00d01 fix task complete (#263) 2019-04-08 21:07:33 +08:00
屈轩
e7505c9bc7 修复:通过镜像创建的磁盘只能使用镜像ID参数 (#259) 2019-04-08 21:04:33 +08:00
wanyaoqi
d31525e9fc Automated cherry pick of #11: import servers from libvirt (#12)
* import servers from libvirt

* dep add libvirt-go-xml

* fix code
2019-04-08 21:01:31 +08:00
Zexi Li
1cd39b05cc fix: scheduler input incompatibility (#272) 2019-04-08 20:19:32 +08:00
Jian Qiu
70afe057ea fix: running guest count incorrect if containers running on host (#274) 2019-04-08 18:46:32 +08:00
Zexi Li
24bcb3d5d9 fix: region list empty or occupied hosts not work (#257) 2019-04-08 15:57:34 +08:00
Zexi Li
5058af8dc8 region: storage support set schedtags (#237) 2019-04-08 10:27:31 +08:00
wanyaoqi
e4737c5a72 fix climc server-deploy (#244) 2019-04-04 22:12:32 +08:00
Yousong Zhou
7c99500476 Automated cherry pick of #235: dep: update yunion.io/x/log (#238)
* treewide: fix typo cloudprovide

* dep: update yunion.io/x/log

* treewide: log.Errorf(err.Error()) to log.Errorln(err)
2019-04-04 22:06:30 +08:00
屈轩
d30d877569 优化扩容已挂载磁盘失败问题 (#249) 2019-04-04 21:56:33 +08:00
Jian Qiu
30ed73b9a8 fix: move vm's metadata sync into deep sync cycle (#234) 2019-04-04 21:50:32 +08:00
wanyaoqi
474abf60c2 action log send to ws service (#246) 2019-04-04 21:48:33 +08:00
Zexi Li
b3e1098890 fix: baremetal convert to host missing cpu and memory params (#242) 2019-04-04 19:51:32 +08:00
Zexi Li
6183e24bd8 fix: GetJointModule2 无法找到 compute_v2 的 endpoint (#231) 2019-04-04 18:25:20 +08:00
wanyaoqi
deec96b160 implement hijacker (#227) 2019-04-04 16:04:21 +08:00
屈轩
bd356833ce 同步镜像最小要求系统盘大小 (#220) 2019-04-04 11:53:20 +08:00
屈轩
5330896970 添加缺失的climc参数选项 (#217) 2019-04-04 11:20:21 +08:00
Jian Qiu
511ea69a6d fix: mark synced removed server with @lost<date> suffix (#215) 2019-04-04 00:33:29 +08:00
屈轩
61ce5c06a0 Automated cherry pick of #201: 补充缺失的al (#202)
* 补充缺失的allowempty tag

* 添加一个可以忽略的错误
2019-04-03 21:50:28 +08:00
屈轩
086c5a2c20 增加错误重试,增加任务成功率 (#198) 2019-04-03 21:39:28 +08:00
Jian Qiu
0fe4577007 feature: add option NameSyncResources to specify resources allowing name synchronization (#212) 2019-04-03 21:25:28 +08:00
Jian Qiu
3d6555cea0 Automated cherry pick of #193: improve server-list performance (#205)
* update vendor

* improve server-list performance

FetchCustomizeColumns that fetch extra fields for all rows 3. separate
read and write http request session

* update: optimize multi-column indexes
2019-04-03 20:13:27 +08:00
Zexi Li
7573536eb1 add OWNERS to support CI robot (#209) 2019-04-03 20:07:03 +08:00
wanyaoqi
e1c781437e bugs fix 2019-04-03 10:46:23 +08:00
Zexi Li
0b99b6874e climc: use default webconsole server url 2019-04-02 23:49:09 +08:00
屈轩
4fdfb05b7a 腾讯云重装系统后状态默认是running 2019-04-02 23:48:21 +08:00
屈轩
778dc211a3 修复:判断镜像状态逻辑错误 2019-04-02 22:24:09 +08:00
屈轩
3a9b8c66fb 忽略因镜像问题导致初始化失败 2019-04-02 21:37:05 +08:00
屈轩
bc5ad29c81 避免rebuild_root时因镜像状态变化导致上传镜像超过限制 2019-04-02 21:23:37 +08:00
屈轩
a39e7c2ce1 手动同步时默认是深度全量同步 2019-04-02 20:50:54 +08:00
屈轩
890808bd0f 同步安全组以公有云为主 2019-04-02 20:48:08 +08:00
屈轩
00d0e3f112 加入自动同步时自动合并安全组 2019-04-02 20:48:08 +08:00
屈轩
a6f5c0b2b0 openstack不能有protocol参数 (#175) 2019-04-02 17:48:58 +08:00
wanyaoqi
7f1aa99ffa Automated cherry pick of #155: bugfix: 1. fix get network desc choose wrong host (#162)
* bugfix: 1. fix get network desc choose wrong host wire 2. fix guest create backup doesn't cache iso image

* host wire detach filter by mac addr
2019-04-02 11:55:57 +08:00
Qiu Jian
d35314fd4c fix: image stream error should return immediately 2019-04-01 22:59:32 +08:00
Qiu Jian
7932e4eacd fix: ucloud GetBalance return ErrNotSupported 2019-04-01 21:02:04 +08:00
Qiu Jian
d48a787d31 fix: exclude hosts whose cloud provider's status not in CLOUD_PROVIDER_VALID_STATUS 2019-04-01 21:02:04 +08:00
Qiu Jian
d3a5457aa5 fix: track balance status of cloud account and avoid unhealth account 2019-04-01 21:02:04 +08:00
屈轩
8615ec8f19 修复Azure: 创建instance使用network-interface ID而非network ID 2019-04-01 20:48:41 +08:00
屈轩
7412ba352b 支持按成功与否过滤 2019-04-01 20:45:27 +08:00
屈轩
72d3dad5ea 腾讯云使用shell格式userdata,避免和cloud-init冲突导致绑定秘钥失败 2019-04-01 11:19:13 +08:00
Qiu Jian
4142a00267 fix: allow automatically choosing available disk storage type if host given 2019-04-01 10:05:19 +08:00
Jian Qiu
458cf8101e fix: skip syncing status if guest in failure status (#139) 2019-03-31 22:03:11 +08:00
Jian Qiu
70320ad95c fix: recode host convert hypervisor, make logic more clear (#135) 2019-03-31 22:00:42 +08:00
Jian Qiu
66d999f1b1 fix: host update status should notify scheduler (#131) 2019-03-31 21:51:53 +08:00
Jian Qiu
24f1aeb031 fix: anonymous user may have admin priviliges (#125) 2019-03-31 15:24:44 +08:00
Qiu Jian
f836bcc405 feature: host add property server_ips that carries the ip list of baremetal server 2019-03-30 08:11:25 +08:00
Qiu Jian
293280f83d fix: ni usercred cause rbac check panic 2019-03-29 22:08:15 +08:00
tb365
89a7bc30f8 修复AWS资源名称为空的问题&增加注入用户登录信息 (#119) 2019-03-29 20:51:50 +08:00
Qiu Jian
b27195815a fix: the default policy for actions not matching any rule defaults to allow 2019-03-29 20:45:32 +08:00
tb365
deac5b4dfd vm metrics fix (#118) 2019-03-29 20:11:29 +08:00
wanyaoqi
478b06b2f5 fix storage commit rate 2019-03-29 18:53:42 +08:00
屈轩
3e3fe847ac 避免续费时未刷新虚拟机状态 2019-03-29 18:36:47 +08:00
屈轩
e5b5c8080a 避免uncache公有云镜像失败 2019-03-29 17:33:10 +08:00
屈轩
531eb60781 使用控制台名称作为同步名称 2019-03-29 16:34:41 +08:00
屈轩
8501e466b6 避免绑定秘钥失败后机器还关联着秘钥 2019-03-29 11:56:58 +08:00
Qiu Jian
c7ccd665b1 fix: do not auto clean expired prepaid servers by default 2019-03-29 00:42:21 +08:00
Qiu Jian
a531cf0813 add more optimization 2019-03-29 00:42:21 +08:00
Qiu Jian
d9a89ce619 minor fixes 2019-03-29 00:42:21 +08:00
Qiu Jian
a7794b9f1c fix: reduce sync workdload by not always sync VM disk/nics/eips & images 2019-03-29 00:42:21 +08:00
Yousong Zhou
fc5356d86a circleci: initial version 2019-03-28 23:11:18 +08:00
Zhang Dongliang
275439681a 删除底层的 action log 2019-03-28 22:32:43 +08:00
Zhang Dongliang
ed04496cfc 为公有云增加 rpm 的定义 2019-03-28 16:33:35 +08:00
屈轩
8d5d1c281d prefer using keypair not password (#67) 2019-03-28 15:52:26 +08:00
Qiu Jian
78c52b7f94 fix: 1. cloud provider update status should clear scheduler cache 2. fix rbact issue prevent admin from creating prepaid vm 2019-03-28 10:15:33 +08:00
屈轩
9c88b3940b fixed security group name duplication that prevented instance from filtering by security group 2019-03-27 22:18:52 +08:00
屈轩
98ab1d82f9 fixed an issue where waiting times were too long due to a lack of refresh operations 2019-03-27 21:18:29 +08:00
屈轩
e078f1e767 remove guest secgroup rule detail 2019-03-27 21:15:29 +08:00
TangBin
6e1ef1b803 aws not found error fix 2019-03-27 20:44:19 +08:00
屈轩
c3c81ef440 避免计费找不到price_key 2019-03-27 20:04:55 +08:00
屈轩
6fdf042362 避免err为nil时指针访问异常 (#37) 2019-03-27 20:02:24 +08:00
Zexi Li
361d4863cd fix: scheduler choose backend incorrect 2019-03-27 17:56:45 +08:00
Zexi Li
51fc9c685a Add travis ci config (#31) 2019-03-27 17:52:12 +08:00
wanyaoqi
4f01353924 server list order by host name 2019-03-27 17:26:05 +08:00
TangBin
cb1085c479 ucloud add method GetSecurityGroupIds 2019-03-27 13:42:27 +08:00
wanyaoqi
760936901b bugfix: 1. fix sched fill disk desc 2. fix image server not handle error (#14) 2019-03-27 11:57:42 +08:00
24294 changed files with 1077204 additions and 8282821 deletions

29
.circleci/Dockerfile Normal file
View File

@@ -0,0 +1,29 @@
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.12.1.linux-amd64.tar.gz \
&& tar xzf go1.12.1.linux-amd64.tar.gz \
&& rm -vf go1.12.1.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
ENV GOPATH="/home/build/go"
ENV PATH="${GOPATH}/bin:${PATH}"

View File

@@ -3,27 +3,20 @@
# Check https://circleci.com/docs/2.0/language-go/ for more details
version: 2
jobs:
test:
requires:
- check
build:
docker:
- image: yunion/alpine-build:3.22.0-go-1.24.6-1
environment:
ONECLOUD_CI_BUILD: "1"
- image: yunionio/onecloud-ci:20190328
#### TEMPLATE_NOTE: go expects specific checkout path representing url
#### 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
- 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
@@ -33,4 +26,4 @@ workflows:
version: 2
build_and_test:
jobs:
- test
- build

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 +0,0 @@
---
name: Bug report
about: 报告代码缺陷/Create a bug report to help us improve
title: '[BUG]'
labels: bug
assignees: ''
---
**问题描述/What happened**:
**环境/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`):
-->

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 +0,0 @@
---
name: 新特性/Feature Request
about: 建议新功能特性/Suggest an idea for this project
title: '[Feature]'
labels: feature
assignees: ''
---
**What would you like to be added**:

View File

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

View File

@@ -1,19 +0,0 @@
**What this PR does / why we need it**:
<!--
- [ ] 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.
-->

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

@@ -1,29 +1,22 @@
# This is how to tell Travis to use the fast container-based test
# runner instead of the slow VM-based one.
sudo: false
dist: bionic
dist: xenial
addons:
apt:
sources:
- sourceline: "deb https://download.ceph.com/debian-luminous/ bionic main"
key_url: "https://download.ceph.com/keys/release.asc"
packages:
- build-essential
- libcephfs-dev
- librbd-dev
- librados-dev
services:
- docker
language: go
go:
- 1.14.x
go_import_path: yunion.io/x/onecloud
cache:
directories:
- $HOME/.cache/go-build
go_import_path: yunion.io/x/onecloud
go:
- "1.12.x"
# Only clone the most recent commit.
git:
depth: 8
depth: 1
script:
- make -j$(nproc) ONECLOUD_CI_BUILD=1
- ls -lh _output/bin
- make docker_build

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

1928
Gopkg.lock generated Normal file

File diff suppressed because it is too large Load Diff

212
Gopkg.toml Normal file
View File

@@ -0,0 +1,212 @@
# Gopkg.toml example
#
# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"
#
# [prune]
# non-go = false
# go-tests = true
# unused-packages = true
[[constraint]]
name = "github.com/pierrec/lz4"
version = "2.0.7"
[[constraint]]
name = "github.com/360EntSecGroup-Skylar/excelize"
version = "1.4.0"
[[constraint]]
name = "github.com/Azure/azure-sdk-for-go"
version = "=19.1.0"
[[constraint]]
branch = "master"
name = "github.com/Microsoft/azure-vhd-utils"
[[constraint]]
name = "github.com/aliyun/alibaba-cloud-sdk-go"
version = "0.7.4"
[[constraint]]
name = "github.com/aliyun/aliyun-oss-go-sdk"
version = "1.9.1"
[[constraint]]
name = "github.com/aokoli/goutils"
version = "1.0.1"
[[constraint]]
name = "github.com/aws/aws-sdk-go"
version = "=1.15.73"
[[constraint]]
name = "github.com/bitly/go-simplejson"
version = "0.5.0"
[[constraint]]
name = "github.com/c-bata/go-prompt"
version = "=0.2.1"
[[constraint]]
name = "github.com/coredns/coredns"
version = "v1.2.0"
[[constraint]]
name = "github.com/fatih/color"
version = "1.7.0"
[[constraint]]
name = "github.com/go-sql-driver/mysql"
version = "1.4.0"
[[constraint]]
name = "github.com/golang-plus/uuid"
version = "1.0.0"
[[constraint]]
branch = "master"
name = "github.com/googollee/go-socket.io"
[[constraint]]
name = "github.com/gorilla/mux"
version = "1.6.2"
[[constraint]]
name = "github.com/gorilla/websocket"
version = "1.4.0"
[[constraint]]
name = "github.com/koding/websocketproxy"
branch = "master"
[[constraint]]
branch = "master"
name = "github.com/gosuri/uitable"
[[constraint]]
name = "github.com/hako/durafmt"
version = "1.0.0"
[[constraint]]
name = "github.com/jinzhu/gorm"
version = "1.9.1"
[[constraint]]
name = "github.com/kr/pty"
version = "1.1.3"
[[constraint]]
name = "github.com/mholt/caddy"
version = "0.10.11"
[[constraint]]
name = "github.com/miekg/dns"
version = "1.0.15"
[[constraint]]
branch = "master"
name = "github.com/moul/http2curl"
[[constraint]]
name = "github.com/nelsonken/cos-go-sdk-v5"
version = "1.21.0"
[[constraint]]
branch = "master"
name = "github.com/serialx/hashring"
[[constraint]]
name = "github.com/stretchr/testify"
version = "1.2.2"
[[constraint]]
name = "github.com/tencentcloud/tencentcloud-sdk-go"
version = "=3.0.30"
[[constraint]]
branch = "master"
name = "github.com/tredoe/osutil"
[[constraint]]
name = "github.com/vmware/govmomi"
version = "0.19.0"
[[constraint]]
branch = "master"
name = "golang.org/x/crypto"
[[constraint]]
name = "gopkg.in/gin-gonic/gin.v1"
version = "1.2.0"
[[constraint]]
name = "k8s.io/api"
version = "kubernetes-1.12.0"
[[constraint]]
branch = "master"
name = "k8s.io/apimachinery"
[[constraint]]
name = "k8s.io/client-go"
version = "9.0.0"
[[constraint]]
branch = "master"
name = "github.com/anacrolix/torrent"
[[constraint]]
branch = "master"
name = "yunion.io/x/jsonutils"
[[constraint]]
branch = "master"
name = "yunion.io/x/log"
[[constraint]]
branch = "master"
name = "yunion.io/x/pkg"
[[constraint]]
branch = "master"
name = "yunion.io/x/sqlchemy"
[[constraint]]
branch = "master"
name = "yunion.io/x/structarg"
[[override]]
name = "github.com/apache/thrift"
revision = "e59b73d3c2bf1c328ccb78e683c0462fa1a473c7"
[prune]
go-tests = true
unused-packages = true
[[constraint]]
name = "github.com/shirou/gopsutil"
version = "2.18.10"
[[constraint]]
name="github.com/ceph/go-ceph"
branch = "master"
[[constraint]]
branch = "master"
name = "github.com/libvirt/libvirt-go-xml"

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.

293
Makefile
View File

@@ -1,26 +1,18 @@
#####################################################
REPO_PREFIX := yunion.io/x/onecloud
VERSION_PKG := yunion.io/x/pkg/util/version
VENDOR_PATH := $(REPO_PREFIX)/vendor
VERSION_PKG := $(VENDOR_PATH)/yunion.io/x/pkg/util/version
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_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
GIT_COMMIT:=x
GIT_BRANCH:=x
GIT_VERSION:=x
BUILD_TREE_STATE:=clean
BUILD_DATE=2099-07-01T07:11:09Z
endif
GIT_COMMIT := $(shell git rev-parse --short HEAD)
GIT_BRANCH := $(shell git rev-parse --abbrev-ref 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')
LDFLAGS := "-w \
-X $(VERSION_PKG).gitVersion=$(GIT_VERSION) \
@@ -33,12 +25,8 @@ LDFLAGS := "-w \
#####################################################
ifneq ($(DLV),)
GO_BUILD_FLAGS += -gcflags "all=-N -l"
LDFLAGS = ""
endif
GO_BUILD_FLAGS+=-mod vendor -ldflags $(LDFLAGS)
GO_BUILD := go build $(GO_BUILD_FLAGS)
GO_BUILD := go build -ldflags $(LDFLAGS)
GO_INSTALL := go install -ldflags $(LDFLAGS)
GO_TEST := go test
@@ -47,20 +35,13 @@ PKGS := go list ./...
CGO_CFLAGS_ENV = $(shell go env CGO_CFLAGS)
CGO_LDFLAGS_ENV = $(shell go env CGO_LDFLAGS)
export GOOS ?= linux
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
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
cmdTargets:=$(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)))
export CGO_CFLAGS = ${X_CGO_CFLAGS}
export CGO_LDFLAGS = ${X_CGO_LDFLAGS}
all: build
@@ -72,38 +53,33 @@ install: prepare_dir
done
gencopyright:
@bash scripts/gencopyright.sh pkg cmd
build: gendoc
$(MAKE) $(filter-out cmd/host-image, $(wildcard cmd/*))
gendoc:
@sh build/gendoc.sh
test:
@go test $(GO_BUILD_FLAGS) $(shell go list ./... | egrep -v 'host-image|hostimage|torrent')
@for PKG in $$( $(PKGS) | grep "$(filter-out $@,$(MAKECMDGOALS))" ); do \
echo $$PKG; \
$(GO_TEST) $$PKG; \
done
vet:
go vet ./...
# cmd/esxi-agent: prepare_dir
# CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
cmd/%: prepare_dir fmt
$(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
cmd/%: prepare_dir
CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
rpm/%: cmd/%
$(BUILD_SCRIPT) $*
deb/%: cmd/%
$(DEB_BUILD_SCRIPT) $*
pkg/%: prepare_dir
pkg/%: prepare_dir fmt
$(GO_INSTALL) $(REPO_PREFIX)/$@
build:
$(MAKE) $(cmdTargets)
# a hack
rpm:
$(MAKE) $(rpmTargets)
deb:
$(MAKE) $(debTargets)
$(MAKE) $(patsubst %,cmd/%,$(filter-out $@,$(MAKECMDGOALS)))
$(foreach cmd,$(filter-out $@,$(MAKECMDGOALS)),$(BUILD_SCRIPT) $(cmd);)
rpmclean:
rm -fr $(BUILD_DIR)/rpms
@@ -118,8 +94,14 @@ bin_dir: output_dir
output_dir:
@mkdir -p $(BUILD_DIR)
dep_clean:
rm -fr $(GOPATH)/pkg/dep/sources/*
.PHONY: all build prepare_dir clean rpm
dep_install:
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
.PHONY: all build prepare_dir clean fmt rpm
clean:
@@ -127,207 +109,14 @@ 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
@find . -type f -name "*.go" -not -path "./_output/*" \
-not -path "./vendor/*" | xargs gofmt -s -w
fmt-check: fmt
@if git status --short | grep -E '^.M .*/[^.]+.go'; then \
git diff | cat; \
echo "$@: working tree modified (possibly by gofmt)" >&2 ; \
false ; \
fi
.PHONY: fmt fmt-check
gendocgo:
@sh build/gendoc.sh
adddocgo:
@git ls-files --others '*/doc.go' | xargs $(XARGS_FLAGS) -- git add
gendocgo-check: gendocgo
@n="$$(git ls-files --others '*/doc.go' | wc -l)"; \
if test "$$n" -gt 0; then \
git ls-files --others '*/doc.go' | sed -e 's/^/ /'; \
echo "$@: untracked doc.go file(s) exist in working directory" >&2 ; \
false ; \
fi
.PHONY: gendocgo adddocgo gendocgo-check
goimports-check:
@goimports -w -local "yunion.io/x/:yunion.io/x/onecloud" pkg cmd; \
if git status --short | grep -E '^.M .*/[^.]+.go'; then \
git diff | cat; \
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 ; \
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
.PHONY: check
define depDeprecated
OneCloud now requires using go-mod for dependency management. dep target,
vendor files will be removed in future versions
Follow the following link to find out more about go-mod
- https://blog.golang.org/using-go-modules
- https://github.com/golang/go/wiki/Modules
Switching to "make mod"...
endef
dep: export depDeprecated:=$(depDeprecated)
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
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
Tidy up go modules and vendor directory
make mod
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
cd $(ROOT_DIR) && dep ensure -v -update $(shell for p in $$(ls vendor/yunion.io/x/); do echo "yunion.io/x/$$p"; done | xargs)
%:
@:
ModName:=yunion.io/x/onecloud
include $(CURDIR)/Makefile.common.mk
docker_build:
$(ROOT_DIR)/build/docker_build.sh

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解读可以参考。

125
README.md
View File

@@ -1,123 +1,4 @@
# 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)
[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.
[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) [![Build Status](https://travis-ci.org/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)

View File

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

View File

@@ -1,10 +0,0 @@
region = 'Yunion'
address = '10.168.222.136'
port = 8890
auth_uri = 'http://10.168.222.136:35357/v3'
admin_user = 'yunionansible'
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,5 +0,0 @@
DESCRIPTION="Yunion Ansible Controller"
REQUIRES=(
"ansible"
)

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,99 +90,51 @@ $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
rpmbuild --define "_topdir $BUILDROOT" -bb $SPEC_FILE $TARGET
mkdir -p $OUTPUT_DIR
cp -fr $RPM_DIR/* $OUTPUT_DIR/
find $RPM_DIR -type f | while read f; do
d="$(dirname "$f")"
d="$OUTPUT_DIR/${d#$RPM_DIR}"
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/

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