Commit Graph
334 Commits
Author SHA1 Message Date
李泽玺 cb59f808bf Automatic merge from release/2.3.0 -> release/2.4.0
* commit '2805e93d9e5465eeb2ddad0640033be9893630d4':
  增加 sched-policy-show command
2018-11-17 10:54:32 +08:00
Qiu Jian 3a04d0c3d3 增加 sched-policy-show command 2018-11-17 08:40:19 +08:00
周有松 84ca002814 Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'ea3aa1bef5426dee9738d3d2708305d3b2ac0ac5':
  climc: dnsrecords: allow create and list with is_public
  cloudcommon: sharablevirtual: set is_public as create:admin_optional
2018-11-15 15:33:12 +08:00
Yousong Zhou 5753f119b9 climc: dnsrecords: allow create and list with is_public 2018-11-15 07:18:50 +00:00
邱剑 e80b5987ff Merge pull request #485 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-climc-version-list to release/2.4.0
* commit 'e11a46058594e8c3a1abba6c7f2410792844417b':
  climc: add commands yunionagent-version-list, yunionagent-version-show
2018-11-14 20:48:51 +08:00
邱剑 0209fec9d3 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '65a5c787c92f35f5082bd1e9142304d1701b2af3':
  climc: set and update k8s cluster engineconfig
2018-11-14 20:04:06 +08:00
Zexi Li 32b62333e2 climc: set and update k8s cluster engineconfig 2018-11-14 18:24:57 +08:00
邱剑 0dfcf1b844 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '4170cdaadc4066ff0bce015e0166b3b53e30eafc':
  修正:climc调用rbac接口参数错误
2018-11-13 22:35:20 +08:00
Qiu Jian 43f9b6d61c 修正:climc调用rbac接口参数错误 2018-11-13 22:33:38 +08:00
Yousong Zhou e11a460585 climc: add commands yunionagent-version-list, yunionagent-version-show 2018-11-13 07:43:11 +00:00
李泽玺 9ea481119d Automatic merge from release/2.3.0 -> release/2.4.0
* commit '6301b2b6af53ac7422659bb72be2a87e0523bbcf':
  support schedule disk
2018-11-12 21:16:40 +08:00
李泽玺 6301b2b6af Merge pull request #467 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-schedule-disk to release/2.3.0
* commit '0244e70516fa14222350673c757ba279d687eb27':
  support schedule disk
2018-11-12 21:16:39 +08:00
Zexi Li 0244e70516 support schedule disk 2018-11-12 18:51:34 +08:00
唐斌 447628410e Automatic merge from release/2.3.0 -> release/2.4.0
* commit '42636c0b13bc9e2a77c0db40e9aeba8ae5f017bf': (120 commits)
  add GetAttachDiskStatus
  add more log
  security group add id tag
  security group sync
  upload image
  add aws toHOST_TYPES
  add aws scheduler api
  bugfix
  add host type mapping
  bugfix
  bugfix
  bugfix
  support aws china
  add azure metadatas
  add aliyun tag
  bugfix
  add aws tags
  read aws instance type from file
  add todo
  zone bugfix
  ...
2018-11-10 20:07:30 +08:00
TangBin 4c3ae8f976 Merge branch 'release/2.3.0' into feature/tb-support-aws 2018-11-10 20:03:07 +08:00
TangBin 74e3f9a699 update vendor 2018-11-10 20:00:36 +08:00
邱剑 b3f5172732 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '0b384660a403f08e5cf42887bec4c4870a59d201':
  增加climc policy-admin-capable命令
2018-11-10 15:30:57 +08:00
邱剑 0b384660a4 Merge pull request #447 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-policy-admin-capable-test to release/2.3.0
* commit 'dbab380d734d0de1684f5cb4472869d5d981d773':
  增加climc policy-admin-capable命令
2018-11-10 15:30:57 +08:00
邱剑 f6b5e943e1 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '492469887b5e55cfec740534125704c8441f92d5':
  添加部分aliyun操作
  支持腾讯云资源导入
2018-11-10 13:35:06 +08:00
邱剑 492469887b Merge pull request #431 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-qcloud to release/2.3.0
* commit 'aab792ffa8ee7f873ab24d5d9ae66bc7ef3ec548':
  添加部分aliyun操作
  支持腾讯云资源导入
2018-11-10 13:35:05 +08:00
Qiu Jian dbab380d73 增加climc policy-admin-capable命令 2018-11-09 15:52:46 +08:00
周有松 09b1d480d6 Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'ff4b6ecad93cd9c6c6d83e4fe31019c51c951d41':
  cloudcommon: validators: return 400 for struct validation failure
  loadbalancers: show loadbalancer name for listener and backend group
  mcclient: loadbalancers: allow updating names
  loadbalancers: more compact backendGroup validation
  lbagent: list with details=true explicitly
  lbagent: fix unused imports
  pkg: httputils: ParseJSONResponse(): rewrite for clearness
  mcclient: base: guard against empty repsonse
  mcclient: options: set details correctly
2018-11-09 14:11:25 +08:00
周有松 ff4b6ecad9 Merge pull request #441 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0
* commit '09e511883cf481bf8142ee9ed3f0892fe1418821':
  cloudcommon: validators: return 400 for struct validation failure
  loadbalancers: show loadbalancer name for listener and backend group
  mcclient: loadbalancers: allow updating names
  loadbalancers: more compact backendGroup validation
  lbagent: list with details=true explicitly
  lbagent: fix unused imports
  pkg: httputils: ParseJSONResponse(): rewrite for clearness
  mcclient: base: guard against empty repsonse
  mcclient: options: set details correctly
2018-11-09 14:11:24 +08:00
Yousong Zhou 13bc224202 mcclient: loadbalancers: allow updating names
- loadbalanceracls: allow updating only name
2018-11-08 15:37:48 +00:00
邱剑 1836c540dc Automatic merge from release/2.3.0 -> release/2.4.0
* commit '0b08b4a3eb96b17b2ea1a51f483d2c48f764348e':
  climc: allow config k8s node docker registry
2018-11-08 20:54:25 +08:00
Zexi Li 5fae00ed96 climc: allow config k8s node docker registry 2018-11-08 20:29:32 +08:00
屈轩 aab792ffa8 添加部分aliyun操作 2018-11-08 15:37:30 +08:00
邱剑 7db5cee6f0 Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'cded919ce0b585b99e398f5adcbcc2d37caa5798':
  Image添加description字段
2018-11-08 01:44:23 +08:00
邱剑 cded919ce0 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '83299b849b473abaa49881a89ffe61576a6ea779':
  Image添加description字段
2018-11-08 01:44:23 +08:00
屈轩 3716e88878 Image添加description字段 2018-11-07 17:56:28 +08:00
TangBin 1f341232de update vendor and fix conficlt 2018-11-07 17:47:00 +08:00
Qiu Jian 4d43fcd39c 增加server sku资源,还需要和创建资源流程,以及公有云接口改造支持 2018-11-07 15:47:46 +08:00
Qiu Jian a497f4dae8 角色增加描述(description)字段 2018-11-05 18:12:47 +08:00
李泽玺 f91760e20d Merge pull request #427 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-helm-app to release/2.3.0
* commit '2feb414106d138a471c3f31c71998f31287cfbd7':
  climc: add k8s servicetree and notify app
2018-11-05 17:32:33 +08:00
Zexi Li 2feb414106 climc: add k8s servicetree and notify app 2018-11-05 16:50:13 +08:00
李泽玺 a534b14586 Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'a5f9d9c6871a2d29b6774cf609c87410e7222c7c':
  2.0.0: make qunar happy
2018-11-05 16:30:22 +08:00
李泽玺 272b2f0983 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'a534b14586c3fb83476044fe35460ea079641a66':
  2.0.0: make qunar happy
2018-11-05 16:30:22 +08:00
李泽玺 a5f9d9c687 Automatic merge from release/2.0.0 -> release/2.1.0
* commit 'b1dade9701606d505315271a09ef1c88cfc48827':
  2.0.0: make qunar happy
2018-11-05 16:30:22 +08:00
Yousong Zhou 1da2255d4f 2.0.0: make qunar happy 2018-11-05 08:27:14 +00:00
Qiu Jian 57203202ec Add dynamic schedtag show command 2018-11-04 01:13:07 +08:00
屈轩 9833767fb2 支持腾讯云资源导入 2018-11-03 17:32:54 +08:00
TangBin bab62348fc support aws china 2018-11-03 17:31:46 +08:00
邱剑 96bc0c5cdb Merge pull request #419 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-scheduler-add-ssl-support to release/2.3.0
* commit '7e463a4644fc774061305fcacfc82f3722947ce4':
  hack: scheduler ping/version escape auth
  make reverse proxy insecure ssl (for influxdb)
  make webconsole ssl capable
  scheduler add ssl support
2018-11-03 13:33:19 +08:00
Qiu Jian 0ad9260186 scheduler add ssl support 2018-11-02 22:20:38 +08:00
邱剑 e095948e99 Merge pull request #407 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-project-add-tag to release/2.3.0
* commit 'c303afcb4644e4fac09da0ca18a8a3ce18e5a144':
  增加keystone project add tag接口支持
2018-11-02 20:34:37 +08:00
邱剑 d73cf3699e Merge pull request #416 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-endpoint-list to release/2.3.0
* commit '85af9754d7f56f2d065011b44a43297271670b7d':
  climc: endpoint list by service id
2018-11-02 20:34:19 +08:00
Zexi Li 85af9754d7 climc: endpoint list by service id 2018-11-02 20:32:56 +08:00
李泽玺 2952d4ab12 Merge pull request #409 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-helm-app to release/2.3.0
* commit 'af97ebe0bc6cb68968f6d320a9b53284be9bdab8':
  climc: k8s-repo-sync
  climc: helm release app
2018-11-02 16:55:03 +08:00
Zexi Li af97ebe0bc climc: k8s-repo-sync 2018-11-02 12:36:51 +08:00
Qiu Jian c303afcb46 增加keystone project add tag接口支持 2018-11-01 22:30:13 +08:00