Merge pull request #132 from branan/nova_config_default_file

Set the nova_config default target in the type instead of the provider
This commit is contained in:
Dan Bode 2012-07-11 00:30:26 -07:00
commit 4746493bae
3 changed files with 1 additions and 11 deletions

View File

@ -1,11 +1,8 @@
require 'puppet/provider/parsedfile' require 'puppet/provider/parsedfile'
novaconf = "/etc/nova/nova.conf"
Puppet::Type.type(:nova_config).provide( Puppet::Type.type(:nova_config).provide(
:parsed, :parsed,
:parent => Puppet::Provider::ParsedFile, :parent => Puppet::Provider::ParsedFile,
:default_target => novaconf,
:filetype => :flat :filetype => :flat
) do ) do

View File

@ -1,11 +1,8 @@
require 'puppet/provider/parsedfile' require 'puppet/provider/parsedfile'
novaconf = "/etc/nova/nova.conf"
Puppet::Type.type(:nova_config).provide( Puppet::Type.type(:nova_config).provide(
:configfile, :configfile,
:parent => Puppet::Provider::ParsedFile, :parent => Puppet::Provider::ParsedFile,
:default_target => novaconf,
:filetype => :flat :filetype => :flat
) do ) do

View File

@ -16,11 +16,7 @@ Puppet::Type.newtype(:nova_config) do
newproperty(:target) do newproperty(:target) do
desc "Path to our nova config file" desc "Path to our nova config file"
defaultto { defaultto {
if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile) "/etc/nova/nova.conf"
@resource.class.defaultprovider.default_target
else
nil
end
} }
end end