Fix to remove conflicted symlink

Since cisco plugin coexists with ovs, a symlink
pointing to ovs already exists causing a conflict
with cisco_plugins.ini. This fix should default
the symlink to ovs.

Change-Id: I98c7b2e08257a6d9c07916b9b114bcb21d913e4f

manifests/plugins/cisco.pp

@@ -171,11 +171,9 @@
 
   # In RH, this link is used to start Neutron process but in Debian, it's used only
   # to manage database synchronization.
-  file {'/etc/neutron/plugin.ini':
+  ensure_resource('file', '/etc/neutron/plugin.ini', {
     ensure  => link,
-    target  => '/etc/neutron/plugins/cisco/cisco_plugins.ini',
-    require => Package['neutron-plugin-cisco']
-  }
-
-
+    target  => '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini',
+    require => Package['neutron-plugin-ovs']
+  })
 }

spec/classes/neutron_plugins_cisco_spec.rb

@@ -42,8 +42,8 @@ class { 'neutron': rabbit_password => 'passw0rd' }"
     it 'should create plugin symbolic link' do
       should contain_file('/etc/neutron/plugin.ini').with(
         :ensure  => 'link',
-        :target  => '/etc/neutron/plugins/cisco/cisco_plugins.ini',
-        :require => 'Package[neutron-plugin-cisco]'
+        :target  => '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini',
+        :require => 'Package[neutron-plugin-ovs]'
       )
     end