diff --git a/lib/puppet/provider/gnocchi_api_uwsgi_config/openstackconfig.rb b/lib/puppet/provider/gnocchi_api_uwsgi_config/ini_setting.rb similarity index 59% rename from lib/puppet/provider/gnocchi_api_uwsgi_config/openstackconfig.rb rename to lib/puppet/provider/gnocchi_api_uwsgi_config/ini_setting.rb index d9881407..f2e94536 100644 --- a/lib/puppet/provider/gnocchi_api_uwsgi_config/openstackconfig.rb +++ b/lib/puppet/provider/gnocchi_api_uwsgi_config/ini_setting.rb @@ -1,6 +1,6 @@ Puppet::Type.type(:gnocchi_api_uwsgi_config).provide( - :openstackconfig, - :parent => Puppet::Type.type(:openstack_config).provider(:ruby) + :ini_setting, + :parent => Puppet::Type.type(:openstack_config).provider(:ini_setting) ) do def self.file_path diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cad00b19..a558483b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,5 @@ +# Load libraries from openstacklib here to simulate how they live together in a real puppet run (for provider unit tests) +$LOAD_PATH.push(File.join(File.dirname(__FILE__), 'fixtures', 'modules', 'openstacklib', 'lib')) require 'puppetlabs_spec_helper/module_spec_helper' require 'shared_examples' require 'puppet-openstack_spec_helper/facts' diff --git a/spec/unit/provider/gnocchi_api_uwsgi_config/openstackconfig_spec.rb b/spec/unit/provider/gnocchi_api_uwsgi_config/ini_setting_spec.rb similarity index 89% rename from spec/unit/provider/gnocchi_api_uwsgi_config/openstackconfig_spec.rb rename to spec/unit/provider/gnocchi_api_uwsgi_config/ini_setting_spec.rb index 715fdc7b..6cd2fd03 100644 --- a/spec/unit/provider/gnocchi_api_uwsgi_config/openstackconfig_spec.rb +++ b/spec/unit/provider/gnocchi_api_uwsgi_config/ini_setting_spec.rb @@ -9,19 +9,8 @@ $LOAD_PATH.push( 'inifile', 'lib') ) -$LOAD_PATH.push( - File.join( - File.dirname(__FILE__), - '..', - '..', - '..', - 'fixtures', - 'modules', - 'openstacklib', - 'lib') -) require 'spec_helper' -provider_class = Puppet::Type.type(:gnocchi_api_uwsgi_config).provider(:openstackconfig) +provider_class = Puppet::Type.type(:gnocchi_api_uwsgi_config).provider(:ini_setting) describe provider_class do it 'should default to the default setting when no other one is specified' do