]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commitdiff
(maint) Update for PDK templates
authorGlenn Sarti <glennsarti@users.noreply.github.com>
Fri, 1 Nov 2019 01:17:09 +0000 (09:17 +0800)
committerGlenn Sarti <glennsarti@users.noreply.github.com>
Fri, 1 Nov 2019 01:52:32 +0000 (09:52 +0800)
This commit updates the module as per PDK-Templates commit 0b5b39b

.rubocop.yml
.sync.yml
Gemfile
metadata.json
spec/default_facts.yml

index 3cd2b0e5a9770b6200f94ce58e8868cca049fd6f..bab25db5361fca376f4282262de0554e2f2338d2 100644 (file)
@@ -27,6 +27,7 @@ GetText/DecorateString:
   Description: We don't want to decorate test output.
   Exclude:
   - spec/**/*
+  Enabled: false
 RSpec/BeforeAfterAll:
   Description: Beware of using after(:all) as it may cause state to leak between tests.
     A necessary evil in acceptance testing.
@@ -88,6 +89,12 @@ Style/MethodCalledOnDoEndBlock:
   Enabled: true
 Style/StringMethods:
   Enabled: true
+GetText/DecorateFunctionMessage:
+  Enabled: false
+GetText/DecorateStringFormattingUsingInterpolation:
+  Enabled: false
+GetText/DecorateStringFormattingUsingPercent:
+  Enabled: false
 Layout/EndOfLine:
   Enabled: false
 Layout/IndentHeredoc:
index 596f792bf15988186c883372c58641268d1d0685..b9f29ab0ff9fbabefd86591485de92595b8e7c3f 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -7,15 +7,7 @@
   unmanaged: true
 
 .travis.yml:
-  bundle_args: --without system_tests
-  docker_sets:
-    - set: docker/centos-7
-    - set: docker/ubuntu-14.04
-  docker_defaults:
-    bundler_args: ""
-  secure: ""
-  branches:
-    - release
+  unmanaged: true
 
 appveyor.yml:
   delete: true
diff --git a/Gemfile b/Gemfile
index 177a2ca1b532b45bc7131f0c988df244bacd5be7..f7560c16269fc8043a9907bc336c49a8e502a1f3 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -71,4 +71,4 @@ extra_gemfiles.each do |gemfile|
     eval(File.read(gemfile), binding)
   end
 end
-# vim: syntax=ruby
\ No newline at end of file
+# vim: syntax=ruby
index 234812c466e39ec167daa9220c5b430ef0a88a4d..dca41d29409cd51641d3879d3f4744b1edb036cc 100644 (file)
@@ -77,6 +77,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "tags/1.13.0-0-g66e1443",
-  "pdk-version": "1.13.0"
+  "template-ref": "1.14.1-0-g0b5b39b",
+  "pdk-version": "1.14.0"
 }
index ea1e4808e3a67f50ea6d64d23a0eb8b3fd25437f..f777abfc9905202e7ccf5b5fcc76b9b4c59a39fb 100644 (file)
@@ -3,5 +3,6 @@
 # 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"
 is_pe: false
 macaddress: "AA:AA:AA:AA:AA:AA"