diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 99cf29c8c374f63bc1486c2a8a3c0d4e8cc8cb2c..3dca3937999bba7cd5466390cf3d3160a28bca75 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -226,6 +226,7 @@ tunnel_interface: "{{ network_interface }}" octavia_network_interface: "{{ api_interface }}" bifrost_network_interface: "{{ network_interface }}" dns_interface: "{{ network_interface }}" +dpdk_tunnel_interface: "{{ neutron_external_interface }}" # Configure the address family (AF) per network. # Valid options are [ ipv4, ipv6 ] @@ -239,10 +240,12 @@ tunnel_address_family: "{{ network_address_family }}" octavia_network_address_family: "{{ api_address_family }}" bifrost_network_address_family: "{{ network_address_family }}" dns_address_family: "{{ network_address_family }}" +dpdk_tunnel_address_family: "{{ network_address_family }}" migration_interface_address: "{{ 'migration' | kolla_address }}" tunnel_interface_address: "{{ 'tunnel' | kolla_address }}" octavia_network_interface_address: "{{ 'octavia_network' | kolla_address }}" +dpdk_tunnel_interface_address: "{{ 'dpdk_tunnel' | kolla_address }}" # Valid options are [ openvswitch, ovn, linuxbridge, vmware_nsxv, vmware_nsxv3, vmware_dvs ] neutron_plugin_agent: "openvswitch" diff --git a/ansible/roles/ovs-dpdk/defaults/main.yml b/ansible/roles/ovs-dpdk/defaults/main.yml index a85781e3e32aedd8cd4a6d94ac91b2b86cd11862..6948c558ac5f3283bb67d30c2d34c460e0bd86b8 100644 --- a/ansible/roles/ovs-dpdk/defaults/main.yml +++ b/ansible/roles/ovs-dpdk/defaults/main.yml @@ -39,8 +39,6 @@ ovsdpdk_services: #################### ovs_bridge_mappings: "{% for bridge in neutron_bridge_name.split(',') %}physnet{{ loop.index0 + 1 }}:{{ bridge }}{% if not loop.last %},{% endif %}{% endfor %}" ovs_port_mappings: "{% for bridge in neutron_bridge_name.split(',') %} {{ neutron_external_interface.split(',')[loop.index0] }}:{{ bridge }}{% if not loop.last %},{% endif %}{% endfor %}" -dpdk_tunnel_interface: "{{ neutron_external_interface }}" -dpdk_tunnel_interface_address: "{{ 'dpdk_tunnel' | kolla_address }}" tunnel_interface_network: "{{ hostvars[inventory_hostname]['ansible_' + dpdk_tunnel_interface]['ipv4']['network']}}/{{hostvars[inventory_hostname]['ansible_' + dpdk_tunnel_interface]['ipv4']['netmask'] }}" tunnel_interface_cidr: "{{ dpdk_tunnel_interface_address }}/{{ tunnel_interface_network | ipaddr('prefix') }}" 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 %}" diff --git a/ansible/roles/ovs-dpdk/templates/ovsdpdk-db.json.j2 b/ansible/roles/ovs-dpdk/templates/ovsdpdk-db.json.j2 index fdeea72ecbc3cdc1bcd1b4236f7a4bb17c8265b9..6f75d747cf7e1ebd3c911f6b658d635be1979714 100644 --- a/ansible/roles/ovs-dpdk/templates/ovsdpdk-db.json.j2 +++ b/ansible/roles/ovs-dpdk/templates/ovsdpdk-db.json.j2 @@ -1,4 +1,4 @@ { - "command": "start-ovsdb-server {{ api_interface_address }}", + "command": "start-ovsdb-server 127.0.0.1", "config_files": [] } diff --git a/releasenotes/notes/fix-dpdk-deploy-failed-6695899422a67359.yaml b/releasenotes/notes/fix-dpdk-deploy-failed-6695899422a67359.yaml new file mode 100644 index 0000000000000000000000000000000000000000..ded1af9cbfb4dfaf65b5b109faaceee8a31cc6ba --- /dev/null +++ b/releasenotes/notes/fix-dpdk-deploy-failed-6695899422a67359.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Fix the wrong configuration of the ovs-dpdk service. + this breaks the deployment of kolla-ansible. + For more details please see `bug 1908850 + <https://bugs.launchpad.net/kolla-ansible/+bug/1908850>`__.