From 55f952d3cf92a0bf960fc8f0b79e574438e44f73 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Tue, 1 Apr 2014 13:53:02 -0400 Subject: [PATCH] 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 | 10 ++++------ spec/classes/neutron_plugins_cisco_spec.rb | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/manifests/plugins/cisco.pp b/manifests/plugins/cisco.pp index 5bddc988c..1cd90f7f4 100644 --- a/manifests/plugins/cisco.pp +++ b/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'] + }) } diff --git a/spec/classes/neutron_plugins_cisco_spec.rb b/spec/classes/neutron_plugins_cisco_spec.rb index 1e09c512a..243834248 100644 --- a/spec/classes/neutron_plugins_cisco_spec.rb +++ b/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