From 84805214bba2eef88a432f7279e714745fbc8442 Mon Sep 17 00:00:00 2001 From: Rick Paxton Date: Wed, 28 Feb 2024 16:40:15 -0500 Subject: [PATCH] PDK Updates --- .pdkignore | 1 + Gemfile | 5 +++++ metadata.json | 16 ++++++++-------- spec/default_facts.yml | 7 ++++--- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.pdkignore b/.pdkignore index 584438f..862847a 100644 --- a/.pdkignore +++ b/.pdkignore @@ -29,6 +29,7 @@ /.fixtures.yml /Gemfile /.gitattributes +/.github/ /.gitignore /.pdkignore /.puppet-lint.rc diff --git a/Gemfile b/Gemfile index add1873..ca0e773 100644 --- a/Gemfile +++ b/Gemfile @@ -34,12 +34,17 @@ group :development do gem "rubocop", '= 1.48.1', require: false gem "rubocop-performance", '= 1.16.0', require: false gem "rubocop-rspec", '= 2.19.0', require: false + gem "puppet-strings", '~> 4.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] end group :system_tests do gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] gem "serverspec", '~> 2.41', require: false end +group :release_prep do + gem "puppet-strings", '~> 4.0', require: false + gem "puppetlabs_spec_helper", '~> 6.0', require: false +end puppet_version = ENV['PUPPET_GEM_VERSION'] facter_version = ENV['FACTER_GEM_VERSION'] diff --git a/metadata.json b/metadata.json index cc68160..6cfa4c5 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "encore-ipa", - "version": "0.2.3", + "version": "0.2.4", "author": "Encore Technologies", "summary": "Manages IPA servers and clients.", "license": "Apache-2.0", @@ -14,7 +14,7 @@ }, { "name": "puppet/firewalld", - "version_requirement": ">= 3.0.0 < 5.0.0" + "version_requirement": ">= 3.0.0 < 6.0.0" }, { "name": "ghoneycutt/facter", @@ -22,11 +22,11 @@ }, { "name": "puppet/epel", - "version_requirement": ">= 3.0.0 < 5.0.0" + "version_requirement": ">= 3.0.0 < 6.0.0" }, { "name": "puppetlabs/yumrepo_core", - "version_requirement": ">= 1.0.0 < 2.0.0" + "version_requirement": ">= 1.0.0 < 3.0.0" } ], "operatingsystem_support": [ @@ -57,10 +57,10 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 4.7.0 <= 8.0.0" + "version_requirement": ">= 6.0.0 <= 8.0.0" } ], - "pdk-version": "3.0.0", - "template-url": "pdk-default#3.0.0", - "template-ref": "tags/3.0.0-0-g056e50d" + "pdk-version": "3.0.1", + "template-url": "pdk-default#3.0.1", + "template-ref": "tags/3.0.1-0-gd13288a" } diff --git a/spec/default_facts.yml b/spec/default_facts.yml index f777abf..3346c39 100644 --- a/spec/default_facts.yml +++ b/spec/default_facts.yml @@ -2,7 +2,8 @@ # # Facts specified here will override the values provided by rspec-puppet-facts. --- -ipaddress: "172.16.254.254" -ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA" +networking: + ip: "172.16.254.254" + ip6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA" + mac: "AA:AA:AA:AA:AA:AA" is_pe: false -macaddress: "AA:AA:AA:AA:AA:AA"