openstack
/
puppet-nova
Code Issues Proposed changes

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
parent 273d94e94e f64e532e8a
commit 4746493bae
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/puppet/provider/nova_config/parsed.rb
View File

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

3
lib/puppet/provider/nova_config/parsed_config.rb
View File

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

6
lib/puppet/type/nova_config.rb
View File

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