Merge "Fix neutron_agent_linuxbridge file path"

2015-09-08 13:05:53 +00:00
parent 2c21af85da d465022f42
commit 2551810e8a
1 changed files with 5 additions and 1 deletions
--- a/lib/puppet/provider/neutron_agent_linuxbridge/ini_setting.rb
+++ b/lib/puppet/provider/neutron_agent_linuxbridge/ini_setting.rb
@@ -16,7 +16,11 @@ Puppet::Type.type(:neutron_agent_linuxbridge).provide(
  end

  def file_path
-    '/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini'
+    if Facter['operatingsystem'].value == 'Ubuntu'
+      '/etc/neutron/plugins/ml2/ml2_conf.ini'
+    else
+      '/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini'
+    end
  end

 end