From 98f286cd7b8a8f15615f75b71343387e3414f476 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Tue, 20 Apr 2021 17:03:48 +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 runs indenpotant.

Change-Id: I2bd2a61263db8d7e54397ab85b4c51b79644adf2
---
 .../{openstackconfig.rb => ini_setting.rb}          |  4 ++--
 .../{openstackconfig.rb => ini_setting.rb}          |  4 ++--
 ...{openstackconfig_spec.rb => ini_setting_spec.rb} | 13 +------------
 ...{openstackconfig_spec.rb => ini_setting_spec.rb} | 13 +------------
 4 files changed, 6 insertions(+), 28 deletions(-)
 rename lib/puppet/provider/nova_api_metadata_uwsgi_config/{openstackconfig.rb => ini_setting.rb} (61%)
 rename lib/puppet/provider/nova_api_uwsgi_config/{openstackconfig.rb => ini_setting.rb} (58%)
 rename spec/unit/provider/nova_api_metadata_uwsgi_config/{openstackconfig_spec.rb => ini_setting_spec.rb} (90%)
 rename spec/unit/provider/nova_api_uwsgi_config/{openstackconfig_spec.rb => ini_setting_spec.rb} (91%)

diff --git a/lib/puppet/provider/nova_api_metadata_uwsgi_config/openstackconfig.rb b/lib/puppet/provider/nova_api_metadata_uwsgi_config/ini_setting.rb
similarity index 61%
rename from lib/puppet/provider/nova_api_metadata_uwsgi_config/openstackconfig.rb
rename to lib/puppet/provider/nova_api_metadata_uwsgi_config/ini_setting.rb
index c031a426a..9a2a73513 100644
--- a/lib/puppet/provider/nova_api_metadata_uwsgi_config/openstackconfig.rb
+++ b/lib/puppet/provider/nova_api_metadata_uwsgi_config/ini_setting.rb
@@ -1,6 +1,6 @@
 Puppet::Type.type(:nova_api_metadata_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/lib/puppet/provider/nova_api_uwsgi_config/openstackconfig.rb b/lib/puppet/provider/nova_api_uwsgi_config/ini_setting.rb
similarity index 58%
rename from lib/puppet/provider/nova_api_uwsgi_config/openstackconfig.rb
rename to lib/puppet/provider/nova_api_uwsgi_config/ini_setting.rb
index 82408df75..5270dd3f5 100644
--- a/lib/puppet/provider/nova_api_uwsgi_config/openstackconfig.rb
+++ b/lib/puppet/provider/nova_api_uwsgi_config/ini_setting.rb
@@ -1,6 +1,6 @@
 Puppet::Type.type(:nova_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/unit/provider/nova_api_metadata_uwsgi_config/openstackconfig_spec.rb b/spec/unit/provider/nova_api_metadata_uwsgi_config/ini_setting_spec.rb
similarity index 90%
rename from spec/unit/provider/nova_api_metadata_uwsgi_config/openstackconfig_spec.rb
rename to spec/unit/provider/nova_api_metadata_uwsgi_config/ini_setting_spec.rb
index ed9aa7cec..3077a3c8b 100644
--- a/spec/unit/provider/nova_api_metadata_uwsgi_config/openstackconfig_spec.rb
+++ b/spec/unit/provider/nova_api_metadata_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(:nova_api_metadata_uwsgi_config).provider(:openstackconfig)
+provider_class = Puppet::Type.type(:nova_api_metadata_uwsgi_config).provider(:ini_setting)
 describe provider_class do
 
   it 'should default to the default setting when no other one is specified' do
diff --git a/spec/unit/provider/nova_api_uwsgi_config/openstackconfig_spec.rb b/spec/unit/provider/nova_api_uwsgi_config/ini_setting_spec.rb
similarity index 91%
rename from spec/unit/provider/nova_api_uwsgi_config/openstackconfig_spec.rb
rename to spec/unit/provider/nova_api_uwsgi_config/ini_setting_spec.rb
index 35ecfa80c..b8bdea52a 100644
--- a/spec/unit/provider/nova_api_uwsgi_config/openstackconfig_spec.rb
+++ b/spec/unit/provider/nova_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(:nova_api_uwsgi_config).provider(:openstackconfig)
+provider_class = Puppet::Type.type(:nova_api_uwsgi_config).provider(:ini_setting)
 describe provider_class do
 
   it 'should default to the default setting when no other one is specified' do