From ef9d67832a3d363d3d6fd3b4d895713df4c34513 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Tue, 20 Apr 2021 18:13:29 +0200
Subject: [PATCH] Debian api_uwsgi_config: Switch to :ini_setting

On each puppet run, I'm seeing:
value changed ['12'] to '12' (corrective)

Therefore, this patch switches from :openstackconfig to :ini_setting
to make the 2nd run not changing anything.

Change-Id: Ibd5f33715c856aba5a6c34b74d3d49ceb09e5f28
---
 .../provider/aodh_api_uwsgi_config/ini_setting.rb   |  4 ++--
 spec/spec_helper.rb                                 |  2 ++
 ...{openstackconfig_spec.rb => ini_setting_spec.rb} | 13 +------------
 3 files changed, 5 insertions(+), 14 deletions(-)
 rename spec/unit/provider/aodh_api_uwsgi_config/{openstackconfig_spec.rb => ini_setting_spec.rb} (91%)

diff --git a/lib/puppet/provider/aodh_api_uwsgi_config/ini_setting.rb b/lib/puppet/provider/aodh_api_uwsgi_config/ini_setting.rb
index c5b964a8..dc69f9fc 100644
--- a/lib/puppet/provider/aodh_api_uwsgi_config/ini_setting.rb
+++ b/lib/puppet/provider/aodh_api_uwsgi_config/ini_setting.rb
@@ -1,6 +1,6 @@
 Puppet::Type.type(:aodh_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/aodh_api_uwsgi_config/openstackconfig_spec.rb b/spec/unit/provider/aodh_api_uwsgi_config/ini_setting_spec.rb
similarity index 91%
rename from spec/unit/provider/aodh_api_uwsgi_config/openstackconfig_spec.rb
rename to spec/unit/provider/aodh_api_uwsgi_config/ini_setting_spec.rb
index 39527d6f..e84a4ae7 100644
--- a/spec/unit/provider/aodh_api_uwsgi_config/openstackconfig_spec.rb
+++ b/spec/unit/provider/aodh_api_uwsgi_config/ini_setting_spec.rb
@@ -14,19 +14,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(:aodh_api_uwsgi_config).provider(:openstackconfig)
+provider_class = Puppet::Type.type(:aodh_api_uwsgi_config).provider(:ini_setting)
 describe provider_class do
 
   it 'should default to the default setting when no other one is specified' do