Skip to content

Commit 05e6d4a

Browse files
wchy1001yoctozepto
authored andcommitted
Fix dpdk deploy failed
This change fix ansible deploy ovs-dpdk failed and neutron_openvswitch_agent container can't start.. dpdk_tunnel is a role variable, but kolla_address gets vaule from hostvars. so we need remove this variable and it's friends to group/all.yaml neutron_openvswitch_agent connects to ovs-db with 127.0.0.1, but ovs-db listen on management interface. Closes-Bug: 1908850 Change-Id: I86a13d2476644bfa2545a6737752cda1ade34d23 (cherry picked from commit b12be30)
1 parent 1258f90 commit 05e6d4a

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

ansible/group_vars/all.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ tunnel_interface: "{{ network_interface }}"
227227
octavia_network_interface: "{{ api_interface }}"
228228
bifrost_network_interface: "{{ network_interface }}"
229229
dns_interface: "{{ network_interface }}"
230+
dpdk_tunnel_interface: "{{ neutron_external_interface }}"
230231

231232
# Configure the address family (AF) per network.
232233
# Valid options are [ ipv4, ipv6 ]
@@ -240,10 +241,12 @@ tunnel_address_family: "{{ network_address_family }}"
240241
octavia_network_address_family: "{{ api_address_family }}"
241242
bifrost_network_address_family: "{{ network_address_family }}"
242243
dns_address_family: "{{ network_address_family }}"
244+
dpdk_tunnel_address_family: "{{ network_address_family }}"
243245

244246
migration_interface_address: "{{ 'migration' | kolla_address }}"
245247
tunnel_interface_address: "{{ 'tunnel' | kolla_address }}"
246248
octavia_network_interface_address: "{{ 'octavia_network' | kolla_address }}"
249+
dpdk_tunnel_interface_address: "{{ 'dpdk_tunnel' | kolla_address }}"
247250

248251
# Valid options are [ openvswitch, ovn, linuxbridge, vmware_nsxv, vmware_nsxv3, vmware_dvs ]
249252
neutron_plugin_agent: "openvswitch"

ansible/roles/ovs-dpdk/defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ ovsdpdk_services:
3939
####################
4040
ovs_bridge_mappings: "{% for bridge in neutron_bridge_name.split(',') %}physnet{{ loop.index0 + 1 }}:{{ bridge }}{% if not loop.last %},{% endif %}{% endfor %}"
4141
ovs_port_mappings: "{% for bridge in neutron_bridge_name.split(',') %} {{ neutron_external_interface.split(',')[loop.index0] }}:{{ bridge }}{% if not loop.last %},{% endif %}{% endfor %}"
42-
dpdk_tunnel_interface: "{{ neutron_external_interface }}"
43-
dpdk_tunnel_interface_address: "{{ 'dpdk_tunnel' | kolla_address }}"
4442
tunnel_interface_network: "{{ hostvars[inventory_hostname]['ansible_' + dpdk_tunnel_interface]['ipv4']['network']}}/{{hostvars[inventory_hostname]['ansible_' + dpdk_tunnel_interface]['ipv4']['netmask'] }}"
4543
tunnel_interface_cidr: "{{ dpdk_tunnel_interface_address }}/{{ tunnel_interface_network | ipaddr('prefix') }}"
4644
ovs_cidr_mappings: "{% if neutron_bridge_name.split(',')|length != 1 %} {neutron_bridge_name.split(',')[0]}:{{ tunnel_interface_cidr }} {% else %} {{ neutron_bridge_name }}:{{ tunnel_interface_cidr }} {% endif %}"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"command": "start-ovsdb-server {{ api_interface_address }}",
2+
"command": "start-ovsdb-server 127.0.0.1",
33
"config_files": []
44
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
fixes:
3+
- |
4+
Fix the wrong configuration of the ovs-dpdk service.
5+
this breaks the deployment of kolla-ansible.
6+
For more details please see `bug 1908850
7+
<https://bugs.launchpad.net/kolla-ansible/+bug/1908850>`__.

0 commit comments

Comments
 (0)