Commit Graph
1120 Commits
Author SHA1 Message Date
Zexi Li a57f8e46be baremetal: quit signal handle 2019-01-26 15:39:31 +08:00
邱剑 a2414dddb9 Merge pull request #976 in YUNIONIO/onecloud from ~NINGYU/onecloud:feature/ningyu-meter-alert to release/2.6.0
* commit 'f6a8b9de6d0dc9f3409aa4a3f3082744a978235b':
  feat: 添加余额和日消费报警功能
  feat: 添加余额和日消费报警功能
2019-01-26 14:21:43 +08:00
wanyaoqi 4e77136adf remove jsonutils NewPair 2019-01-26 11:53:21 +08:00
万垚奇 ba7ae5641b Automatic merge from release/2.5.0 -> release/2.6.0
* commit '84e33c9148454b354af68f0fd7ce9f16627734c9':
  fix disk-list
2019-01-25 17:38:45 +08:00
万垚奇 84e33c9148 Automatic merge from release/2.4.0 -> release/2.5.0
* commit 'ca97105c95898f9ae357ca07b98d8caf9ca6a027':
  fix disk-list
2019-01-25 17:38:45 +08:00
wanyaoqi 65ac44f3e9 fix disk-list 2019-01-25 17:29:26 +08:00
ningyu 0e26b9be17 feat: 添加余额和日消费报警功能 2019-01-25 16:09:42 +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
邱剑 2031d63401 Merge pull request #963 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-server-create-with-eip to release/2.6.0
* commit '4c422533236babb6ebad3b8083d5cebd67d0092f':
  fix eip-dissociate cmd options
  改进:1. 创建主机时可以绑定指定eip,或者新建eip并且绑定。2. 取消绑定eip时候可以自动删除eip
2019-01-25 14:53:38 +08:00
Qiu Jian 96b81f40c1 改进:对Aws系统镜像分类处理 2019-01-25 12:34:07 +08:00
邱剑 d71f94c71a Automatic merge from release/2.5.0 -> release/2.6.0
* commit '6ebc5d9f02f123e62fc0d2b65d1f2f884c0d806b':
  disk-list filter public & private cloud
2019-01-24 14:50:25 +08:00
邱剑 6ebc5d9f02 Automatic merge from release/2.4.0 -> release/2.5.0
* commit '03499f7ccc21a131f2da7a7f7cfdf1ac8c0e5ce0':
  disk-list filter public & private cloud
2019-01-24 14:50:25 +08:00
wanyaoqi a64b8e15cd reslove conflict 2019-01-24 14:28:56 +08:00
万垚奇 1295bc5ec2 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'ac2263a6918d47308892d960177ebedefd59a640':
  disk-list filter public & private cloud
2019-01-24 13:31:55 +08:00
万垚奇 ac2263a691 Merge pull request #966 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/disk-list to release/2.2.0
* commit 'e5d4060f1b682c4f681f1263001c49325210c8d3':
  disk-list filter public & private cloud
2019-01-24 13:31:55 +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
wanyaoqi e5d4060f1b disk-list filter public & private cloud 2019-01-24 11:00:52 +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 cd0247f1a8 add cmd loadbalancer-network-list 2019-01-23 14:51:57 +08:00
Qiu Jian 4c42253323 fix eip-dissociate cmd options 2019-01-23 12:31:29 +08:00
Qiu Jian c9a6bfa9e0 改进:1. 创建主机时可以绑定指定eip,或者新建eip并且绑定。2.
取消绑定eip时候可以自动删除eip
2019-01-23 12:26:48 +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
wanyaoqi c792eba33d temp 2019-01-22 16:56:48 +08:00
Zexi Li 07863a7d6f baremetal prepare 2019-01-22 16:56:47 +08:00
Zexi Li 703b094a60 baremetal init 2019-01-22 16:56:47 +08:00
wanyaoqi 1bb42ae017 20181204-20181205 2019-01-22 16:56:47 +08:00
wanyaoqi cab32944b9 2018-12-04: init commit 2019-01-22 16:56:47 +08:00
屈轩 26a9be5bee 修复大小写错误 2019-01-22 14:14:22 +08:00
Qiu Jian c5343a111b 修正:由于阿里云网络与SNAT关联,导致无法删除 2019-01-22 02:46:35 +08:00
Qiu Jian beb2ac66b5 增加:1. 将公有云标准镜像同步到本地 2. 可以从公有云标准镜像创建主机 3.
在公有云缓存镜像时遵守公有云镜像的配额
2019-01-21 09:21:02 +08:00
唐斌 919f164f95 huawei support stage 2 2019-01-19 17:58:00 +08:00
屈轩 a1a0445779 避免传递tenant_id和onecloud api冲突 2019-01-19 12:20:45 +08:00
屈轩 6debca92e5 增加缺少的参数 2019-01-18 17:55:36 +08:00
屈轩 8f65712632 climc 更新 2019-01-18 10:57:36 +08:00
Qiu Jian daba249249 minor updates 2019-01-17 00:08:57 +08:00
Qiu Jian d3da407cd0 torrent recode 2019-01-16 23:24:41 +08:00
Qiu Jian 302be0e576 增加disk-save命令 2019-01-15 23:47:02 +08:00
邱剑 95e8e3ad6a Automatic merge from release/2.4.0 -> release/2.5.0
* commit '21ac2061b8ebf2bd0525ee837968f87b52293a9f':
  lbagent: fix typo in log
  lbagent: use encoding/json for {,de}serialization
  lbagent: 改正cloudcommon.CommonOptions使用
  lbagent: 改正isempty()使用
2019-01-15 17:10:55 +08:00
Yousong Zhou 082cff6acd lbagent: 改正cloudcommon.CommonOptions使用 2019-01-15 08:00:44 +00:00
Zexi Li b59b1c4519 region: host 支持通过 set-schedtag 接口添加删除调度标签 2019-01-14 12:32:18 +08:00
Qiu Jian caa7b8f25a user-create default-project-id 2019-01-14 12:24:54 +08:00
Qiu Jian 706238404e 修正:1. 包年包月资源池添加和减少操作需要做状态检查 2.
同步时候忽略包年包月资源次的host和storage
2019-01-11 21:13:40 +08:00
Qiu Jian 01db84f737 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-vmware-sync-skip-failed-host 2019-01-09 20:54:48 +08:00
Qiu Jian 606802b582 修正:1. attach权限校验总是false 2. 增加climc user
default_project_id相关方法
2019-01-09 20:49:26 +08:00
Qiu Jian 4fb3974367 修正对包年包月主机续费后没有效果的问题 2019-01-09 16:42:59 +08:00