openstack
/
tripleo-ansible
Code Issues Proposed changes

Use vip_map data instead of deployed_server_port_map 

The deployed_server_port_map variable depends on the deprecated
DeployedServerPortMap parameter[1]. This change replaces the variables
used to detect interface ips so that we can remove the deprecated tht
parameter.

[1] 26be3179905c7751812aa10a0af9f56e58e7ef08

Depends-on: https://review.opendev.org/862970
Depends-on: https://review.opendev.org/862973
Change-Id: I4059bb4591656bf4e66059b6993b0a2b6706a01c
This commit is contained in:
Takashi Kajinami 2022-10-30 01:14:28 +09:00
parent d2323bb1e6
commit 42b30f2709
3 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tripleo_ansible/roles/tripleo_network_config/molecule/default/converge.yml
View File

@ -28,30 +28,14 @@
ctlplane_dns_nameservers: []
dns_search_domains: []
neutron_public_interface_name: dummy0
deployed_server_port_map:
control_virtual_ip:
fixed_ips:
- ip_address: 203.0.113.3
network:
tags:
- 203.0.113.0/24
subnets:
- cidr: 203.0.113.0/24
public_virtual_ip:
fixed_ips:
- ip_address: 203.0.113.1
network:
tags:
- 203.0.113.0/24
subnets:
- cidr: 203.0.113.0/24
standalone-ctlplane:
fixed_ips:
- ip_address: 203.0.113.1
network:
tags:
- 203.0.113.0/24
subnets:
- cidr: 203.0.113.0/24
net_vip_map:
ctlplane: 203.0.113.3
ctlplane_subnet: 203.0.113.0/24
ctlplane_uri: 203.0.113.3
vip_port_map:
external:
ip_address: 203.0.113.1
ip_address_uri: 203.0.113.1
ip_subnet: 203.0.113.0/24
roles:
- role: "tripleo_network_config"

4
tripleo_ansible/roles/tripleo_network_config/templates/standalone.j2
View File

@ -1,6 +1,6 @@
---
{% set control_virtual_ip = deployed_server_port_map.control_virtual_ip.fixed_ips[0].ip_address %}
{% set public_virtual_ip = deployed_server_port_map.public_virtual_ip.fixed_ips[0].ip_address %}
{% set control_virtual_ip = net_vip_map.ctlplane %}
{% set public_virtual_ip = vip_port_map.external.ip_address %}
{% if ':' in control_virtual_ip %}
{% set control_virtual_cidr = 128 %}
{% else %}

4
tripleo_ansible/roles/tripleo_network_config/templates/undercloud.j2
View File

@ -1,6 +1,6 @@
---
{% set control_virtual_ip = deployed_server_port_map.control_virtual_ip.fixed_ips[0].ip_address %}
{% set public_virtual_ip = deployed_server_port_map.public_virtual_ip.fixed_ips[0].ip_address %}
{% set control_virtual_ip = net_vip_map.ctlplane %}
{% set public_virtual_ip = net_vip_map[service_net_map['public_network']] %}
{% if ':' in control_virtual_ip %}
{% set control_virtual_cidr = 128 %}
{% else %}