opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
693 Commits 27 Branches 687 Tags
96713696b82ebe866f7d91c867d051325d04deea
Commit Graph
112 Commits
Author SHA1 Message Date
TangBin d4ab9d8b69 bugfix import path error 2018-09-13 14:35:35 +08:00
TangBin 9b6b1a76a6 Merge branch 'release/2.2.0' into feature/tb-paramter-climc 2018-09-13 14:25:12 +08:00
TangBin b7ca29581f add yunionconf service 2018-09-13 14:24:20 +08:00
邱剑 24751ec50a Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '329cf9aa5afa944ddacdebee004bafd3e4cdb610':
  修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效
 2018-09-12 20:06:22 +08:00
Qiu Jian 860f6b8c02 修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效 2018-09-12 18:22:50 +08:00
邱剑 3b6b0c3795 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'a1b67853de1238e0d8ce0a569c4d8214dedca934':
  mcclient: register WebConsole
  climc: support create resource from file, raw put body fix
 2018-09-11 21:56:07 +08:00
邱剑 a1b67853de Merge pull request #175 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-deploy-from-file to release/2.1.0 
* commit '32adce2d02d4cc820ccafc9a0cfb4f6227ec5b15':
  mcclient: register WebConsole
  climc: support create resource from file, raw put body fix
 2018-09-11 21:56:06 +08:00
邱剑 33884e5f75 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e2b3cbd1d09e699a2b7c7be969252b282e034134':
  region: cloudregion usage
 2018-09-11 21:53:58 +08:00
Zexi Li c860812e91 region: cloudregion usage 2018-09-11 18:15:40 +08:00
邱剑 786489162b Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e03a31a65d32799840888d124d61f731382569ae':
  dep: update structarg
  climc: trim angle brackets for required options
  validators: add BoolValidator
  validators: add ValidatorStringMultiChoices
 2018-09-11 00:12:39 +08:00
邱剑 e03a31a65d Merge pull request #182 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.1.0 
* commit 'ad67ecb7dd46cc0ecf32c3a1104da9d89b9b8054':
  dep: update structarg
  climc: trim angle brackets for required options
  validators: add BoolValidator
  validators: add ValidatorStringMultiChoices
 2018-09-11 00:12:39 +08:00
Yousong Zhou 2325aa7ad0 climc: trim angle brackets for required options 2018-09-10 16:08:21 +00:00
邱剑 a42cef6e77 Merge pull request #160 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/local-disk-snapshot to release/2.2.0 
* commit '5b5733916624792de9fe4c1aa438c0d320e80a4e':
  fix code
  - local disk snapshot create and delete - auto snapshot everyday - rewrite cornman - make dep and some fix - fix conflict
 2018-09-10 23:55:25 +08:00
邱剑 c4ec9a4721 Merge pull request #176 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-server-associate-dissociate-eip to release/2.1.0 
* commit '9365da05f64000d4bfedbecb298c3820dc7ac189':
  增加：server-associate-eip/server-dissociate-eip接口
 2018-09-10 23:53:33 +08:00
邱剑 4a53a4154b Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'c4ec9a47212cc1acaf010654eac7e735d35fbb7f':
  增加：server-associate-eip/server-dissociate-eip接口
 2018-09-10 23:53:33 +08:00
邱剑 480d7cd65e Merge pull request #170 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-aliyun-account-balance to release/2.1.0 
* commit '0c79c6e4e6a907073e25dcde0645b457a151e0a8':
  增加阿里云账户余额接口支持
 2018-09-10 23:53:17 +08:00
邱剑 c6f4ed074d Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '480d7cd65ef38407a2d1a5aff48c0d47efa84dfc':
  增加阿里云账户余额接口支持
 2018-09-10 23:53:17 +08:00
TangBin b700a7bedc fix help desc string 2018-09-10 19:27:11 +08:00
TangBin a8c70bd9a1 bugfix 2018-09-10 19:10:00 +08:00
Zexi Li eb3ff786a7 climc: support create resource from file, raw put body fix 2018-09-10 16:32:18 +08:00
TangBin 30f692b88d add parameter climc 2018-09-10 15:03:31 +08:00
Qiu Jian 9365da05f6 增加：server-associate-eip/server-dissociate-eip接口 2018-09-10 14:15:43 +08:00
TangBin aed6a23cfe delete&update parameter in context 2018-09-10 11:30:09 +08:00
邱剑 9eca9e0305 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '481a6a1ae6a668dba221ad748949661d271d4a9e':
  增加/capabilities接口，获取后端的总体能力信息，用于按需显示云端服务菜单
 2018-09-10 11:18:23 +08:00
邱剑 481a6a1ae6 Merge pull request #171 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-general-capabilities to release/2.1.0 
* commit '3c8ea2cddf8e586d280dac8849e7e50c0dabbb13':
  增加/capabilities接口，获取后端的总体能力信息，用于按需显示云端服务菜单
 2018-09-10 11:18:22 +08:00
邱剑 bf28b32156 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '5de6c10a4b3fbca206e53083ed59ae4b06f90668':
  修正：已经绑定EIP的主机不能再绑定EIP
  修正：1. 阿里云主机镜像正确设置Platform后，可以正确初始化密码和蜜钥 2. 系统启动默认创建default安全组，主机默认安全组设置为default。defalt安全组默认出入都开放
 2018-09-09 09:06:10 +08:00
邱剑 5de6c10a4b Merge pull request #167 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-aliyun-vm-unaccessible to release/2.1.0 
* commit '1aa1fba80111ad9fc4a9f80d99efeba47f947753':
  修正：已经绑定EIP的主机不能再绑定EIP
  修正：1. 阿里云主机镜像正确设置Platform后，可以正确初始化密码和蜜钥 2. 系统启动默认创建default安全组，主机默认安全组设置为default。defalt安全组默认出入都开放
 2018-09-09 09:06:07 +08:00
李泽玺 6fd5bf3a8e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7798b928659004dbf4b6faa8c5c2391a7f5dc513':
  climc: k8s general raw resource GET, PUT, DELETE support
 2018-09-07 14:08:32 +08:00
李泽玺 7798b92865 Merge pull request #172 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-add-k8s-raw-res to release/2.1.0 
* commit '87d99fca2a0193168d2b1d3dcc35d84f677d07f2':
  climc: k8s general raw resource GET, PUT, DELETE support
 2018-09-07 14:08:31 +08:00
Zexi Li 87d99fca2a climc: k8s general raw resource GET, PUT, DELETE support 2018-09-07 13:22:37 +08:00
李泽玺 4dc815ce90 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'cbd159596b32073e75786562347e4aa2b1c7c86e':
  climc: k8s resource client api for nodes, namespace, statefulset, ingress
 2018-09-07 11:59:33 +08:00
李泽玺 cbd159596b Merge pull request #168 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-add-k8s-cli-v3 to release/2.1.0 
* commit 'd36f20d5c923b201ca7511ae015df73eadf84f33':
  climc: k8s resource client api for nodes, namespace, statefulset, ingress
 2018-09-07 11:59:32 +08:00
Qiu Jian 3c8ea2cddf 增加/capabilities接口，获取后端的总体能力信息，用于按需显示云端服务菜单 2018-09-07 11:42:37 +08:00
Qiu Jian 0c79c6e4e6 增加阿里云账户余额接口支持 2018-09-06 23:21:01 +08:00
wanyaoqi 5b57339166 fix code 2018-09-06 20:30:08 +08:00
TangBin 53a7a35f4c temp!!withbugs 2018-09-06 20:08:32 +08:00
李泽玺 0732b80d05 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '62e269b20f3639fd21a9aeb986bbe89959aef60c':
  webconsole: support baremetal ipmitool sol
 2018-09-06 19:32:11 +08:00
李泽玺 62e269b20f Merge pull request #165 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feautre/lzx-webterm to release/2.1.0 
* commit '94a5eedae4bf55055873de3d2f6b329ec7452963':
  webconsole: support baremetal ipmitool sol
 2018-09-06 19:32:11 +08:00
Zexi Li d36f20d5c9 climc: k8s resource client api for nodes, namespace, statefulset, 
ingress
 2018-09-06 18:15:52 +08:00
wanyaoqi 4f2b50a869 - local disk snapshot create and delete 
- auto snapshot everyday
- rewrite cornman
- make dep and some fix
- fix conflict
 2018-09-06 16:22:36 +08:00
Qiu Jian 7c795f7975 修正：1. 阿里云主机镜像正确设置Platform后，可以正确初始化密码和蜜钥 
2.
系统启动默认创建default安全组，主机默认安全组设置为default。defalt安全组默认出入都开放
 2018-09-06 15:10:55 +08:00
TangBin 5f01cb9c04 add climc 2018-09-05 19:48:52 +08:00
Zexi Li 94a5eedae4 webconsole: support baremetal ipmitool sol 2018-09-05 18:14:08 +08:00
邱剑 dc74b221da Merge pull request #161 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-elastic-ip to release/2.1.0 
* commit '82bbb2054b9d72b542ea5d4d3aea931fe1103f26':
  fix log
  修正：1. 已经绑定的EIP禁止删除 2. 删除server时候清除public IP记录
  浮动IP支持
  temp commit
 2018-09-05 17:02:45 +08:00
邱剑 6d29c36abb Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'dc74b221da68ed6f2e86ca6b8dcb9bab9d3d361b':
  fix log
  修正：1. 已经绑定的EIP禁止删除 2. 删除server时候清除public IP记录
  浮动IP支持
  temp commit
 2018-09-05 17:02:45 +08:00
李泽玺 08f8ae51c3 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '3485184266e553d278c9c68ddaae3850dbc4cc8a':
  webconsole: use external frontend
  - remove unused code - add rpm build files
  vendor added
  webterm init
 2018-09-05 16:10:36 +08:00
Zexi Li 955fe9b2e3 webconsole: use external frontend 2018-09-05 16:09:04 +08:00
Qiu Jian 45f7f6febe Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-elastic-ip 2018-09-04 23:46:43 +08:00
Qiu Jian f4f2d8fb97 浮动IP支持 2018-09-04 23:04:29 +08:00
Zexi Li a6736da35e webterm init 2018-09-04 18:44:52 +08:00