From f64e532e8ac68ce470463ddc44e24b1c9eadfcc4 Mon Sep 17 00:00:00 2001 From: Branan Purvine-Riley Date: Tue, 10 Jul 2012 17:01:04 -0700 Subject: [PATCH] Set the nova_config default target in the type instead of the provider This makes it possible to run the spec tests on systems without a valid provider. --- lib/puppet/provider/nova_config/parsed.rb | 3 --- lib/puppet/provider/nova_config/parsed_config.rb | 3 --- lib/puppet/type/nova_config.rb | 6 +----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/puppet/provider/nova_config/parsed.rb b/lib/puppet/provider/nova_config/parsed.rb index 1860dea17..955b67d9b 100644 --- a/lib/puppet/provider/nova_config/parsed.rb +++ b/lib/puppet/provider/nova_config/parsed.rb @@ -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 diff --git a/lib/puppet/provider/nova_config/parsed_config.rb b/lib/puppet/provider/nova_config/parsed_config.rb index dd1ef4baa..3c8722efe 100644 --- a/lib/puppet/provider/nova_config/parsed_config.rb +++ b/lib/puppet/provider/nova_config/parsed_config.rb @@ -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 diff --git a/lib/puppet/type/nova_config.rb b/lib/puppet/type/nova_config.rb index f8637b9f2..450a79fc9 100644 --- a/lib/puppet/type/nova_config.rb +++ b/lib/puppet/type/nova_config.rb @@ -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