Commit Graph
821 Commits
Author SHA1 Message Date
Qiu Jian 6f8ce3b32d Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-network-type-pxe-ipmi
Conflicts:
	cmd/climc/shell/networks.go
2019-01-30 22:19:29 +08:00
Qiu Jian 77b95af988 feature:
1. change SERVER_TYPE_* to NETWORK_TYpE_*
2. add NETWORK_TYPE_PXE and NETWORK_TYPE_IPMI specifically for baremetal PXE and IPMI
network allocation
2019-01-29 23:38:15 +08:00
TangBin 852d6ad343 fix rule validate 2019-01-29 10:20:26 +08:00
万垚奇 28c0452851 Merge pull request #984 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/host-baremetal-v2 to release/2.6.0
* commit '06446f778364e97cd2df66d8ed40f3c0c4d6574e': (135 commits)
  baremetal: ipmitool passowrd EscapeEchoString
  add hostmetrics
  add hostmetrics
  types struct 符合命名规范
  修正:centos 7宿主机格式化的ext4和xfs能够被centos 6虚拟机挂载
  add bsd raw socket code
  fix code
  fix code
  dep add gopsutil/mem
  fix dhcp server
  baremetal: quit signal handle
  baremetal: quit signal handle
  fix dhcp server
  gendoc
  remove jsonutils NewPair
  fix qmp montior cmd
  snapshot recycle, disk recycle, dhcp relay use raw socket
  fix code, test migrate snapshot, fix deploy
  add migrate presend arp
  add ethernet pkg
  ...
2019-01-28 20:04:24 +08:00
李泽玺 a80b2a515c Merge pull request #992 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-conflict-resolve-2.6.0 to release/2.6.0
* commit 'c1e450f38c6043eec331ab7fafd88ffe0acd70a6':
  修复opentack同步的问题
  climc命令行参数向后兼容,否则yunion-test脚本失败
2019-01-28 11:21:30 +08:00
Zexi Li dd4c1fe0ae types struct 符合命名规范 2019-01-28 10:06:56 +08:00
邱剑 c97fd82409 Merge pull request #973 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-aws-image-fetch-info to release/2.6.0
* commit '878bc69358620916304e5c28d6b15d7c20d88756':
  minor updates
  改进:对Aws系统镜像分类处理
2019-01-26 20:10:17 +08:00
屈轩 c1e450f38c 解决冲突 2019-01-26 18:47:47 +08:00
邱剑 32e23a3fb4 Merge pull request #979 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-allow-kvm-running-change-disk to release/2.6.0
* commit 'f2d3460bad989229d1584a6c3b6beab00681bd10':
  update make fmt
  改进:允许kvm虚拟机在不关机状态下调整磁盘
2019-01-26 18:00:46 +08:00
屈轩 881ed73ce5 修复opentack同步的问题 2019-01-26 16:45:37 +08:00
Zexi Li af143ae2ae 修正:centos 7宿主机格式化的ext4和xfs能够被centos 6虚拟机挂载 2019-01-26 16:40:02 +08:00
周有松 5562e8a528 Merge pull request #939 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-lb-create to release/2.6.0
* commit '409b376ebdd13086d2a5a7462ab076827dff0f25':
  修正udp,tcp后端服务器组id异常
  添加监听同步配置操作
  统一LoadBalancer函数大小写问题
  添加region driver
2019-01-26 15:57:03 +08:00
邱剑 50eca7811b Merge pull request #970 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-create-vm to release/2.6.0
* commit '0a9db10e8356780e7192de1efbe118b3d8f7d0d2':
  优化创建虚机结构
  优化虚机创建方法
2019-01-26 14:22:03 +08:00
wanyaoqi dd7ec6518b gendoc 2019-01-26 11:58:45 +08:00
Qiu Jian c6eaa4ad9b 改进:允许kvm虚拟机在不关机状态下调整磁盘 2019-01-26 02:17:59 +08:00
wanyaoqi 60fe104da2 snapshot recycle, disk recycle, dhcp relay use raw socket 2019-01-25 20:32:44 +08:00
Qiu Jian 878bc69358 minor updates 2019-01-25 17:12:31 +08:00
屈轩 409b376ebd 修正udp,tcp后端服务器组id异常 2019-01-25 15:00:45 +08:00
屈轩 53b03c1d59 添加监听同步配置操作 2019-01-25 15:00:05 +08:00
屈轩 dc81eb1d5e 统一LoadBalancer函数大小写问题 2019-01-25 14:57:57 +08:00
屈轩 2df78f917f 添加region driver 2019-01-25 14:54:27 +08:00
屈轩 64b9454f9a image status 统一 2019-01-25 13:31:42 +08:00
周有松 b0257cef1d Automatic merge from release/2.5.0 -> release/2.6.0
* commit '700d9229c7f41ef919d0ccb22a543370933fba0d':
  修复lb同步时的一些小问题
2019-01-25 12:42:56 +08:00
周有松 700d9229c7 Merge pull request #962 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-lb-sync to release/2.5.0
* commit 'f6481b73633741cead155b97d2e01c7ee3b2221c':
  修复lb同步时的一些小问题
2019-01-25 12:42:55 +08:00
Qiu Jian 96b81f40c1 改进:对Aws系统镜像分类处理 2019-01-25 12:34:07 +08:00
万垚奇 c7e69d24f1 Merge pull request #20 in ~WANYAOQI/onecloud from feature/wyq/host-server-v2 to feature/host-baremetal-v2
* commit 'a18ab045c3a16e112edebb15f471e7fb333e8dfa':
  fix code, test migrate snapshot, fix deploy
  add migrate presend arp
  add ethernet pkg
  fix code
  complete remaining code exculde rbd, nfs, snapshot recyle, rootfs
2019-01-25 12:01:57 +08:00
屈轩 0a9db10e83 优化创建虚机结构 2019-01-24 21:48:13 +08:00
屈轩 f6481b7363 修复lb同步时的一些小问题 2019-01-24 12:24:51 +08:00
邱剑 0e8d737312 Merge pull request #949 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-huawei-stage-2 to release/2.6.0
* commit '9007c966cf69947f95343ea1b1c33d1d5ff32df3':
  fix comment
  add instance price key
  add more comment
  huaweicli support unsubscirbe instance
  huawei support stage 2
2019-01-24 11:57:21 +08:00
TangBin 9007c966cf fix comment 2019-01-24 11:56:25 +08:00
wanyaoqi 8ac044c8c5 fix code 2019-01-24 11:48:12 +08:00
Zexi Li 16084f8c5f baremetal: task refactor 2019-01-23 21:06:58 +08:00
邱剑 fd6260aeb8 Automatic merge from release/2.5.0 -> release/2.6.0
* commit '3c48686318d232bf4d13f610861f0b7f6f9206cf':
  add cmd loadbalancer-network-list
  minor fixes
  修正:由于阿里云网络与SNAT关联,导致无法删除
2019-01-23 19:49:27 +08:00
Qiu Jian a035a0efb3 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-fix-aliyun-network-fail-to-delete 2019-01-23 14:24:05 +08:00
wanyaoqi cdf2d485d5 complete remaining code exculde rbd, nfs, snapshot recyle, rootfs 2019-01-23 14:22:12 +08:00
唐斌 df882914c7 Automatic merge from release/2.5.0 -> release/2.6.0
* commit 'e38e2f9f86e42405a869764e27647295bf896cb2':
  update aws secrule sync
2019-01-23 11:45:30 +08:00
唐斌 e38e2f9f86 Automatic merge from release/2.4.0 -> release/2.5.0
* commit 'b63e32a8d467a9faa4fae7763c7787831752fd14':
  update aws secrule sync
2019-01-23 11:45:29 +08:00
TangBin d0bb6a894d merge release/2.6.0 2019-01-23 11:14:39 +08:00
Qiu Jian 6ae353ea2d Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-fix-aliyun-network-fail-to-delete 2019-01-23 00:09:22 +08:00
邱剑 53211bdb46 Merge pull request #950 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-create-server-with-native-images to release/2.6.0
* commit '9df351b5f9b8788e9ff43577816c551df8ac3567':
  make fmt import
  minor fixes for vmware
  补充esxi相关功能
  fixes for qcloud&azure
  改进:获取azure官方镜像, 还缺少使用azure官方镜像创建主机的支持
  增加:1. 将公有云标准镜像同步到本地 2. 可以从公有云标准镜像创建主机 3. 在公有云缓存镜像时遵守公有云镜像的配额
2019-01-23 00:07:33 +08:00
Qiu Jian 9df351b5f9 make fmt import 2019-01-23 00:06:07 +08:00
Qiu Jian e92330a0ac minor fixes for vmware 2019-01-22 23:59:41 +08:00
Qiu Jian 77504c35f6 补充esxi相关功能 2019-01-22 23:30:31 +08:00
邱剑 5a11f0ccb4 Merge pull request #954 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-httputils to release/2.5.0
* commit 'fd9446a866943e7a7346fa548628eec11ca0216d':
  统一返回resp error
2019-01-22 23:06:16 +08:00
Qiu Jian 4e3d9a7cf0 fixes for qcloud&azure 2019-01-22 22:53:43 +08:00
wanyaoqi f6b517fdb7 temp commit 2019-01-22 16:56:48 +08:00
wanyaoqi f934debf21 add download handler 2019-01-22 16:56:48 +08:00
wanyaoqi b5d31b3403 system service 2019-01-22 16:56:48 +08:00
wanyaoqi c792eba33d temp 2019-01-22 16:56:48 +08:00
wanyaoqi 609dc7b864 use procutils replace exec 2019-01-22 16:56:48 +08:00