openstack
/
python-tripleoclient
Code Issues Proposed changes

Use full cidr for DeployedServerPortMap 

Since change: I92ee0f9a2107cdf1ca5903d3756a235a79c36c73
the cidr is resolved from the port attributes. Doc's
change: Id1b643db00ade4993449d3eadabea5eb5fe827eb
states the same.

Change-Id: I265e39accea1bef051173ad43a3c654d9632b000
This commit is contained in:
Harald Jensås 2018-10-26 04:47:36 +02:00
parent 709d0ca49f
commit fd507bb137
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

@ -436,7 +436,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
},
@ -455,15 +454,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)}]
}
}
}