Skip to content

Commit

Permalink
Fixes plugin.ini error
Browse files Browse the repository at this point in the history
When executing the cisco.pp manifest it throws an error
if the plugin.ini file is already declared.

Change-Id: Ibc9c8d343d86ffa8af74767ac6fbbd75cf03f45c
  • Loading branch information
imcsk8 committed Jul 8, 2014
1 parent 837e27c commit 9ea03ae
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions manifests/plugins/cisco.pp
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,14 @@

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

0 comments on commit 9ea03ae

Please sign in to comment.