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
This commit is contained in:
parent
61a9cc3a78
commit
b12be305cb
@ -227,6 +227,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 ]
|
||||
@ -240,10 +241,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"
|
||||
|
@ -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 %}"
|
||||
|
@ -1,4 +1,4 @@
|
||||
{
|
||||
"command": "start-ovsdb-server {{ api_interface_address }}",
|
||||
"command": "start-ovsdb-server 127.0.0.1",
|
||||
"config_files": []
|
||||
}
|
||||
|
@ -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>`__.
|
Loading…
Reference in New Issue
Block a user