Commit Graph
1120 Commits
Author SHA1 Message Date
邱剑 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
邱剑 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
邱剑 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
李泽玺 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
屈轩 e744b8d6a9 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-05 14:55:08 +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
邱剑 c5c5a3ead9 Automatic merge from release/2.1.0 -> release/2.2.0
* commit '5646b88f78e9fdedbf116d6b2262571902debef6':
  climc: k8s resources cluster in query or data
2018-09-04 16:34:49 +08:00
Zexi Li b0c62d5512 climc: k8s resources cluster in query or data 2018-09-04 16:25:38 +08:00
邱剑 18e4ab9902 Merge pull request #155 in YUNIONIO/onecloud from release/2.1.0 to release/2.2.0
* commit '283077f9599cd7d13da316516f1a1a3b9156e4d0':
  storage-list显示详情信息
  增加network-set-static-routes等命令
2018-09-04 10:18:55 +08:00
邱剑 283077f959 Automatic merge from release/2.0.0 -> release/2.1.0
* commit '041bf5c2311260af3f3d2991a875e4f5971c2253':
  增加network-set-static-routes等命令
2018-09-04 09:23:51 +08:00
Qiu Jian dad762db61 增加network-set-static-routes等命令 2018-09-03 21:06:54 +08:00
屈轩 3f5b90ca69 resolve conflict 2018-08-31 16:49:21 +08:00
屈轩 1ba5db64cd 添加azure云盘创建代码 2018-08-31 16:29:54 +08:00
TangBin daa0f66f0e notices climc fix 2018-08-30 12:14:16 +08:00
周有松 5383982292 Automatic merge from release/2.1.0 -> release/2.2.0
* commit '6c0b16323a8c02056c11746f5e0a9f682b9d2c66':
  climc: servers: convert to using mcclient/options
  climc: alarmevents: use options for param serialization
  climc: use BaseListOptions from mcclient/options
  mcclient: options: initial version
  dep: -update pkg, structarg, sqlchemy
2018-08-30 11:10:47 +08:00
Yousong Zhou 83e017b9bc Merge branch 'release/2.0.0' into release/2.1.0 2018-08-30 03:01:08 +00:00
Yousong Zhou 34c2b56ca4 climc: servers: convert to using mcclient/options 2018-08-30 02:48:35 +00:00
Yousong Zhou f0c706919a climc: alarmevents: use options for param serialization 2018-08-30 02:48:35 +00:00
Yousong Zhou 60c4096359 climc: use BaseListOptions from mcclient/options 2018-08-30 02:48:35 +00:00
周有松 cb3c0504d5 Automatic merge from release/2.1.0 -> release/2.2.0
* commit '8b12c71e3aaee4105952d065f53bfa7cc4765b2f':
  extend joint filter
2018-08-30 10:24:12 +08:00