diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 40aa828..6eec004 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,14 +5,11 @@ # https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html # ------------------------------------------------------------------------------ # Release Puppet Ruby EOL -# SIMP 6.1 4.10.6 2.1.9 TBD -# SIMP 6.2 4.10.12 2.1.9 TBD # SIMP 6.3 5.5.7 2.4.4 TBD*** # PE 2018.1 5.5.8 2.4.4 2020-05 (LTS)*** # PE 2019.0 6.0 2.5.1 2019-08-31^^^ # # *** = Modules created for SIMP 6.3+ are not required to support Puppet < 5.5 -# ^^^ = SIMP doesn't support 6 yet; tests are info-only and allowed to fail --- stages: - 'sanity' @@ -65,18 +62,6 @@ variables: # Puppet Versions #----------------------------------------------------------------------- -.pup_4: &pup_4 - image: 'ruby:2.1' - variables: - PUPPET_VERSION: '~> 4.0' - MATRIX_RUBY_VERSION: '2.1' - -.pup_4_10: &pup_4_10 - image: 'ruby:2.1' - variables: - PUPPET_VERSION: '~> 4.10.4' - MATRIX_RUBY_VERSION: '2.1' - .pup_5: &pup_5 image: 'ruby:2.4' variables: @@ -92,7 +77,6 @@ variables: MATRIX_RUBY_VERSION: '2.4' .pup_6: &pup_6 - allow_failure: true image: 'ruby:2.5' variables: PUPPET_VERSION: '~> 6.0' @@ -151,10 +135,6 @@ sanity_checks: # Linting #----------------------------------------------------------------------- -pup4-lint: - <<: *pup_4 - <<: *lint_tests - pup5-lint: <<: *pup_5 <<: *lint_tests @@ -174,16 +154,6 @@ pup5.5.7-unit: <<: *pup_5_5_7 <<: *unit_tests -pup4.10-unit: - <<: *pup_4_10 - <<: *unit_tests - pup6-unit: <<: *pup_6 <<: *unit_tests - -# Acceptance tests -# ============================================================================== -# This module does not have acceptance tests yet. -# -# See: https://simp-project.atlassian.net/browse/SIMP-5632) diff --git a/.travis.yml b/.travis.yml index dc3461c..37119f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,15 +5,12 @@ # https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html # ------------------------------------------------------------------------------ # Release Puppet Ruby EOL -# SIMP 6.2 4.10 2.1.9 TBD -# PE 2016.4 4.10 2.1.9 2018-12-31 (LTS) -# PE 2017.3 5.3 2.4.4 2018-12-31 -# SIMP 6.3 5.5 2.4.4 TBD*** -# PE 2018.1 5.5 2.4.4 2020-05 (LTS)*** +# PE 2017.3 5.3 2.4.5 2018-12-31 +# SIMP 6.3 5.5 2.4.5 TBD*** +# PE 2018.1 5.5 2.4.5 2020-05 (LTS)*** # PE 2019.0 6.0 2.5.1 2019-08-31^^^ # # *** = Modules created for SIMP 6.3+ are not required to support Puppet < 5.5 -# ^^^ = SIMP doesn't support 6 yet; tests are info-only and allowed to fail --- language: ruby @@ -24,7 +21,7 @@ stages: - check - spec - name: deploy - if: 'fork = false AND tag = true' + if: 'tag IS present' bundler_args: --without development system_tests --path .vendor @@ -38,17 +35,17 @@ addons: before_install: - rm -f Gemfile.lock + - for x in ${HOME}/.rvm/gems/*; do gem uninstall -I -x -i "${x}" -v '>= 1.17' bundler || true; gem uninstall -I -x -i "${x}@global" -v '>= 1.17' bundler || true; done + - gem install -v '~> 1.16' bundler global: - STRICT_VARIABLES=yes jobs: - allow_failures: - - name: 'Latest Puppet 6.x (allowed to fail)' - include: - stage: check - rvm: 2.4.4 + name: 'Syntax, style, and validation checks' + rvm: 2.4.5 env: PUPPET_VERSION="~> 5.5" script: - bundle exec rake check:dot_underscore @@ -59,22 +56,16 @@ jobs: - bundle exec rake pkg:create_tag_changelog - bundle exec rake lint - bundle exec puppet module build - - stage: spec - name: 'Puppet 4.10 (SIMP 6.2, PE 2016.4)' - rvm: 2.1.9 - env: PUPPET_VERSION="~> 4.10.0" - script: - - bundle exec rake spec - stage: spec name: 'Puppet 5.3 (PE 2017.3)' - rvm: 2.4.4 + rvm: 2.4.5 env: PUPPET_VERSION="~> 5.3.0" script: - bundle exec rake spec - stage: spec - rvm: 2.4.4 + rvm: 2.4.5 name: 'Puppet 5.5 (SIMP 6.3, PE 2018.1)' env: PUPPET_VERSION="~> 5.5.0" script: @@ -82,26 +73,27 @@ jobs: - stage: spec name: 'Latest Puppet 5.x' - rvm: 2.4.4 + rvm: 2.4.5 env: PUPPET_VERSION="~> 5.0" script: - bundle exec rake spec - stage: spec - name: 'Latest Puppet 6.x (allowed to fail)' + name: 'Latest Puppet 6.x' rvm: 2.5.1 - env: PUPPET_VERSION="~>6.0" + env: PUPPET_VERSION="~> 6.0" script: - bundle exec rake spec + # Uncomment the following for deployment tasks and set 'secure' in both + # sections appropriately - stage: deploy - rvm: 2.4.4 + rvm: 2.4.5 script: - true before_deploy: - "export PUPMOD_METADATA_VERSION=`ruby -r json -e \"puts JSON.parse(File.read('metadata.json')).fetch('version')\"`" - '[[ $TRAVIS_TAG =~ ^simp-${PUPMOD_METADATA_VERSION}$|^${PUPMOD_METADATA_VERSION}$ ]]' - deploy: - provider: releases api_key: diff --git a/CHANGELOG b/CHANGELOG index 4048c64..fcac775 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +* Wed May 29 2019 Trevor Vaughan - 1.2.4-0 +- Clarify the note in `simp_options::dns` + * Tue Mar 19 2019 Liz Nemsick - 1.2.3-0 - Use simplib::validate_net_list in lieu of deprecated Puppet 3 validate_net_list diff --git a/Gemfile b/Gemfile index 2d84b37..ab2f8ef 100644 --- a/Gemfile +++ b/Gemfile @@ -1,23 +1,20 @@ -# ------------------------------------------------------------------------------ -# NOTE: SIMP Puppet rake tasks support ruby 2.1.9 -# ------------------------------------------------------------------------------ gem_sources = ENV.fetch('GEM_SERVERS','https://rubygems.org').split(/[, ]+/) gem_sources.each { |gem_source| source gem_source } group :test do gem 'rake' - gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 4.0') + gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 5.5') gem 'rspec' - gem 'rspec-puppet', ['>= 2.6.11', '< 3.0.0'] + gem 'rspec-puppet' gem 'hiera-puppet-helper' - gem 'puppetlabs_spec_helper', '~> 2.7.0' + gem 'puppetlabs_spec_helper' gem 'metadata-json-lint' gem 'puppet-strings' gem 'puppet-lint-empty_string-check', :require => false gem 'puppet-lint-trailing_comma-check', :require => false - gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 2.0.0') - gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', ['>= 5.2', '< 6.0']) + gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 2.2') + gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', '~> 5.6') gem 'facterdb' end @@ -29,5 +26,5 @@ end group :system_tests do gem 'beaker' gem 'beaker-rspec' - gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.10') + gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', ['>= 1.14.1', '< 2.0.0']) end diff --git a/manifests/dns.pp b/manifests/dns.pp index 31870ad..215a597 100644 --- a/manifests/dns.pp +++ b/manifests/dns.pp @@ -1,7 +1,4 @@ -# -# simp_options::dns class -# -# Sets up DNS configuration variables +# @summary Sets up DNS configuration variables # # @param search The DNS search list. Remember to put these in the appropriate # order for your environment. @@ -12,13 +9,16 @@ # will configure themselves as caching DNS servers pointing to the other # entries in the list. # -# Also, if you have a system that's including SIMP's ``named`` class and is -# **not** in this list, then you'll need to set a variable at the top of that -# node entry called ``$named_server`` to ``true``. +# --------------------------------------------------------------------------- +# If you are using the SIMP ``resolv`` module, and the system is a DNS server +# using the SIMP ``named`` module but you wish to have your node point to a +# different DNS server for primary DNS resolution, then you MUST set +# ``resolv::named_server`` to ``true`` via Hiera. # # This will get around the convenience logic that was put in place to handle # the caching entries and will not attempt to convert your system to a # caching DNS server. +# --------------------------------------------------------------------------- # # @author SIMP Team - https://simp-project.com # diff --git a/metadata.json b/metadata.json index 5e8a3e9..69f60d4 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "simp-simp_options", - "version": "1.2.3", + "version": "1.2.4", "author": "SIMP Team", "summary": "Variables enabling SIMP core capabilities", "license": "Apache-2.0",