diff --git a/roles/cloud_compute/files/neutron_plugin.ini b/roles/cloud_compute/files/neutron_plugin.ini
new file mode 100644
index 0000000000..8980a0663e
--- /dev/null
+++ b/roles/cloud_compute/files/neutron_plugin.ini
@@ -0,0 +1,26 @@
+[ml2]
+type_drivers = local,flat,gre
+tenant_network_types = gre
+mechanism_drivers = openvswitch
+
+[ml2_type_flat]
+
+[ml2_type_vlan]
+
+[ml2_type_gre]
+tunnel_id_ranges = 1:1000
+
+[ml2_type_vxlan]
+
+[securitygroup]
+firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
+enable_security_group = True
+
+[ovs]
+local_ip = 172.24.0.3
+tunnel_type = gre
+tunnel_types = gre
+enable_tunneling = True
+
+[agent]
+tunnel_types = gre
diff --git a/roles/cloud_compute/tasks/main.yml b/roles/cloud_compute/tasks/main.yml
index f0317edd76..f55f051090 100644
--- a/roles/cloud_compute/tasks/main.yml
+++ b/roles/cloud_compute/tasks/main.yml
@@ -261,8 +261,8 @@
   notify:
     - restart neutron-openvswitch-agent
 
-# WORKAROUND https://ask.openstack.org/en/question/28734/instance-failed-to-spawn-you-must-call-aug-init-first-to-initialize-augeas/
-- ini_file: dest=/usr/lib/systemd/system/neutron-openvswitch-agent.service section=Service option=ExecStart value="/usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --log-file /var/log/neutron/openvswitch-agent.log"
+- name: Deploy Neutron plugin configuration
+  copy: src=neutron_plugin.ini dest=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
   notify:
     - restart neutron-openvswitch-agent