openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Fix the odl-router condition

Browse Source 
The new ansible version does not apparently accept the old logic so we need to
add a check on both v1 and v2 of odl_router plugin to get bridge_mappings

Change-Id: I19c5cbfb47d2f31b346950532c2203a87697bd8f
This commit is contained in:
Manuel Buil 2017-11-09 19:20:32 +01:00
parent f589f8f8bb
commit 687b8b9f7f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/providers/setup_ovs_opendaylight.yml
View File

@ -29,7 +29,7 @@
when: ovs_manager.stdout == ""
- name: Configure hosts for networking-odl, force kernel datapath
command: "{{ neutron_bin }}/neutron-odl-ovs-hostconfig --noovs_dpdk {% if 'odl-router' in neutron_plugin_base %}--datapath_type=system --bridge_mappings={{ neutron_provider_networks.network_mappings }} {% endif %}"
command: "{{ neutron_bin }}/neutron-odl-ovs-hostconfig --noovs_dpdk {% if 'odl-router_v2' in neutron_plugin_base or 'odl-router' in neutron_plugin_base %}--datapath_type=system --bridge_mappings={{ neutron_provider_networks.network_mappings }} {% endif %}"
when: ovs_manager.stdout == ""
- name: Retrieve current OvS local ip

2
templates/plugins/ml2/ml2_conf.ini.j2
View File

@ -7,7 +7,7 @@ tenant_network_types = {{ neutron_provider_networks.network_types if neutron_pro
mechanism_drivers = {{ neutron_ml2_mechanism_drivers }}
extension_drivers = port_security{% if 'qos' in neutron_plugin_base %},qos{% endif %}{% if 'dns' in neutron_plugin_base %},dns{% endif %}
{% if neutron_plugin_type == 'ml2.opendaylight' and 'odl-router' in neutron_plugin_base %}
{% if neutron_plugin_type == 'ml2.opendaylight' and ('odl-router_v2' in neutron_plugin_base or 'odl-router' in neutron_plugin_base) %}
bridge_mappings = {{ neutron_provider_networks.network_mappings }}
{% endif %}