openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Use full cidr for DeployedServerPortMap"

This commit is contained in:
Zuul 2018-11-15 23:00:27 +00:00 committed by Gerrit Code Review
parent b8dd7066c1 fd507bb137
commit 2e4fd3db8c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tripleoclient/v1/tripleo_deploy.py
View File

@ -438,7 +438,6 @@ class Deploy(command.Command):
# we need to ensure the HostnameMap matches our hostname
hostname_map_name = "%s-%s-0" % (stack_name.lower(), role_name.lower())
data = {
'ControlPlaneSubnetCidr': '%s' % ip_nw.prefixlen,
'HostnameMap': {
hostname_map_name: '%s' % hostname
},
@ -457,15 +456,15 @@ class Deploy(command.Command):
'DeployedServerPortMap': {
('%s-ctlplane' % hostname): {
'fixed_ips': [{'ip_address': ip_addr}],
'subnets': [{'cidr': str(ip_nw.prefixlen)}]
'subnets': [{'cidr': str(ip_nw)}]
},
'control_virtual_ip': {
'fixed_ips': [{'ip_address': ctlplane_vip_addr}],
'subnets': [{'cidr': str(ip_nw.prefixlen)}]
'subnets': [{'cidr': str(ip_nw)}]
},
'public_virtual_ip': {
'fixed_ips': [{'ip_address': public_vip_addr}],
'subnets': [{'cidr': str(ip_nw.prefixlen)}]
'subnets': [{'cidr': str(ip_nw)}]
}
}
}