7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: release v2.4.15

This commit is contained in:
pycook 2024-11-27 15:14:58 +08:00
parent 9c4cc20e13
commit 464b9d5394
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdb-api/api/lib/cmdb/ipam/subnet.py
View File

@ -205,7 +205,7 @@ class SubnetManager(object):
return cidr return cidr
def _add_subnet(self, cidr, **kwargs): def _add_subnet(self, cidr, **kwargs):
kwargs[SubnetBuiltinAttributes.HOSTS_COUNT] = ipaddress.ip_network(cidr).num_addresses - 2 kwargs[SubnetBuiltinAttributes.HOSTS_COUNT] = len(list(ipaddress.ip_network(cidr).hosts()))
kwargs[SubnetBuiltinAttributes.USED_COUNT] = 0 kwargs[SubnetBuiltinAttributes.USED_COUNT] = 0
kwargs[SubnetBuiltinAttributes.ASSIGN_COUNT] = 0 kwargs[SubnetBuiltinAttributes.ASSIGN_COUNT] = 0
kwargs[SubnetBuiltinAttributes.FREE_COUNT] = kwargs[SubnetBuiltinAttributes.HOSTS_COUNT] kwargs[SubnetBuiltinAttributes.FREE_COUNT] = kwargs[SubnetBuiltinAttributes.HOSTS_COUNT]

6
docker-compose.yml
View File

@ -41,7 +41,7 @@ services:
- redis - redis
cmdb-api: cmdb-api:
image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-api:2.4.14 image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-api:2.4.15
container_name: cmdb-api container_name: cmdb-api
env_file: env_file:
- .env - .env
@ -71,7 +71,7 @@ services:
flask cmdb-init-acl flask cmdb-init-acl
flask init-import-user-from-acl flask init-import-user-from-acl
flask init-department flask init-department
nohup flask cmdb-patch -v 2.4.14 & nohup flask cmdb-patch -v 2.4.15 &
flask cmdb-counter > counter.log 2>&1 flask cmdb-counter > counter.log 2>&1
networks: networks:
new: new:
@ -84,7 +84,7 @@ services:
test: "ps aux|grep -v grep|grep -v '1 root'|grep gunicorn || exit 1" test: "ps aux|grep -v grep|grep -v '1 root'|grep gunicorn || exit 1"
cmdb-ui: cmdb-ui:
image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-ui:2.4.14 image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-ui:2.4.15
container_name: cmdb-ui container_name: cmdb-ui
depends_on: depends_on:
cmdb-api: cmdb-api: