openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Apply provider-configuration for 'ml2.ovs.dvr' also

Browse Source 
neutron_plugin_type can be ml2.ovs and ml2.ovs.dvr and this would
still apply to both configurations.

Create a symlink from dvr_config -> ovs_config to work around;

  #  Include provider specific config(s)
  - include_tasks: "{{ item }}"
    with_first_found:
      - files:
          - "{{ neutron_plugin_type.split('.')[-1] }}_config.yml"

in tasks/main.yml

Change-Id: Ieb87d87688bb56cc274bf41311a2b5d6c73fc046
This commit is contained in:
Erik Berg 2018-11-20 09:33:37 +01:00
parent ffa057d9b8
commit e944f06a8e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasks/providers/dvr_config.yml Symbolic link
View File

@ -0,0 +1 @@
ovs_config.yml

4
tasks/providers/ovs_config.yml
View File

@ -21,7 +21,7 @@
state: present state: present
when: when:
- neutron_services['neutron-openvswitch-agent']['group'] in group_names - neutron_services['neutron-openvswitch-agent']['group'] in group_names
- neutron_plugin_type == 'ml2.ovs' - neutron_plugin_type in ['ml2.ovs', 'ml2.ovs.dvr']
- neutron_provider_networks.network_mappings is defined - neutron_provider_networks.network_mappings is defined
- name: Add port to External Network Provider Bridge - name: Add port to External Network Provider Bridge
@ -31,6 +31,6 @@
state: present state: present
when: when:
- neutron_services['neutron-openvswitch-agent']['group'] in group_names - neutron_services['neutron-openvswitch-agent']['group'] in group_names
- neutron_plugin_type == 'ml2.ovs' - neutron_plugin_type in ['ml2.ovs', 'ml2.ovs.dvr']
- neutron_provider_networks.network_mappings is defined - neutron_provider_networks.network_mappings is defined
- neutron_provider_networks.network_interface is defined - neutron_provider_networks.network_interface is defined