From e944f06a8e8da39be9890f55c372962e66f69862 Mon Sep 17 00:00:00 2001
From: Erik Berg <openstack@slipsprogrammor.no>
Date: Tue, 20 Nov 2018 09:33:37 +0100
Subject: [PATCH] Apply provider-configuration for 'ml2.ovs.dvr' also

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
---
 tasks/providers/dvr_config.yml | 1 +
 tasks/providers/ovs_config.yml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 120000 tasks/providers/dvr_config.yml

diff --git a/tasks/providers/dvr_config.yml b/tasks/providers/dvr_config.yml
new file mode 120000
index 00000000..3d636167
--- /dev/null
+++ b/tasks/providers/dvr_config.yml
@@ -0,0 +1 @@
+ovs_config.yml
\ No newline at end of file
diff --git a/tasks/providers/ovs_config.yml b/tasks/providers/ovs_config.yml
index b6958fd3..cf76ed0e 100644
--- a/tasks/providers/ovs_config.yml
+++ b/tasks/providers/ovs_config.yml
@@ -21,7 +21,7 @@
     state: present
   when:
     - 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
 
 - name: Add port to External Network Provider Bridge
@@ -31,6 +31,6 @@
     state: present
   when:
     - 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_interface is defined