diff --git a/.gitignore b/.gitignore index 4c03625..c5236c4 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,8 @@ .envrc /inventory.yaml /spec/fixtures/litmus_inventory.yaml +/.vscode/ +/.devcontainer/ .tmp/ Puppetfile.lock +.ruby-version 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/.ruby-version b/.ruby-version deleted file mode 100644 index ecd7ee5..0000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.5.8 diff --git a/.sync.yml b/.sync.yml index 1362ff9..4956d0b 100644 --- a/.sync.yml +++ b/.sync.yml @@ -10,10 +10,9 @@ appveyor.yml: paths: - '/.vscode/' - '/.devcontainer/' -.gitignore: - paths: - '.tmp/' - 'Puppetfile.lock' + - '.ruby-version' spec/spec_helper.rb: mock_with: ':rspec' coverage_report: true 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 2aa1624..313fed6 100644 --- a/metadata.json +++ b/metadata.json @@ -80,7 +80,7 @@ "tags": [ "powerdns" ], - "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"