(SIMP-7315) Add EL8 support (#45)

* (SIMP-7315) Add EL8 support

* Fixes an issue where the legacy and NetworkManager services were both
  being spawned in all cases.

SIMP-7315 #close
SIMP-7202 #comment Add EL8 support to simp-network

* update spec tests

* update puppet version in gitlab-ci

Co-authored-by: jeannegreulich <[email protected]>

.gitignore

@@ -2,10 +2,11 @@
 .yardoc
 dist/
 pkg/
-spec/fixtures/
+spec/fixtures/*
+!spec/fixtures/hieradata/
+!spec/fixtures/hieradata/*
+spec/fixtures/hieradata/hiera.yaml
 spec/rp_env/
-!/spec/hieradata/default.yaml
-!/spec/fixtures/site.pp
 .rspec_system
 .vagrant/
 .bundle/
@@ -14,3 +15,4 @@ vendor/
 junit/
 log/
 doc/
+.idea/

.gitlab-ci.yml

@@ -5,8 +5,8 @@
 # https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html
 # ------------------------------------------------------------------------------
 # Release       Puppet   Ruby   EOL
-# SIMP 6.3      5.5.10    2.4.4  TBD***
-# PE 2018.1     5.5.10   2.4.5  2020-05 (LTS)***
+# SIMP 6.3      5.5.16    2.4.4  TBD***
+# PE 2018.1     5.5.16   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
@@ -69,10 +69,10 @@ variables:
     BEAKER_PUPPET_COLLECTION: 'puppet5'
     MATRIX_RUBY_VERSION: '2.4'
 
-.pup_5_5_10: &pup_5_5_10
+.pup_5_5_16: &pup_5_5_16
   image: 'ruby:2.4'
   variables:
-    PUPPET_VERSION: '5.5.10'
+    PUPPET_VERSION: '5.5.16'
     BEAKER_PUPPET_COLLECTION: 'puppet5'
     MATRIX_RUBY_VERSION: '2.4'
 
@@ -150,8 +150,8 @@ pup5-unit:
   <<: *pup_5
   <<: *unit_tests
 
-pup5.5.10-unit:
-  <<: *pup_5_5_10
+pup5.5.16-unit:
+  <<: *pup_5_5_16
   <<: *unit_tests
 
 pup6-unit:
@@ -161,20 +161,20 @@ pup6-unit:
 # Acceptance Tests
 #-----------------------------------------------------------------------
 
-pup5.5.10:
-  <<: *pup_5_5_10
+pup5.5.16:
+  <<: *pup_5_5_16
   <<: *acceptance_base
   script:
     - 'bundle exec rake beaker:suites'
 
-pup5.5.10-fips:
-  <<: *pup_5_5_10
+pup5.5.16-fips:
+  <<: *pup_5_5_16
   <<: *acceptance_base
   script:
     - 'BEAKER_fips=yes bundle exec rake beaker:suites'
 
-pup5.5.10-oel:
-  <<: *pup_5_5_10
+pup5.5.16-oel:
+  <<: *pup_5_5_16
   <<: *acceptance_base
   script:
     - 'bundle exec rake beaker:suites[default,oel]'

CHANGELOG

@@ -1,4 +1,9 @@
-* Fri Aug 02 2019 Robert Vincent <[email protected]> - 6.1.1-0
+* Fri Dec 20 2019 Trevor Vaughan <[email protected]> - 6.2.0-0
+- Add EL8 support
+- Fix a bug where both the legacy network and NetworkManager were activated in
+  all cases
+
+* Fri Aug 02 2019 Robert Vincent <[email protected]> - 6.2.0-0
 - Support puppetlabs/concat 6.x and puppetlabs/stdlib 6.x.
 
 * Wed Apr 17 2019 Trevor Vaughan <[email protected]> - 6.1.0-0

Gemfile

@@ -1,13 +1,10 @@
-# ------------------------------------------------------------------------------
-# 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',  '~> 5.5')
+  gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 5.5')
   gem 'rspec'
   gem 'rspec-puppet'
   gem 'hiera-puppet-helper'
@@ -16,27 +13,17 @@ group :test do
   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.2')
-  gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', '~> 5.6')
+  gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', ['>= 2.4.0', '< 3.0.0'] )
+  gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', ['>= 5.9', '< 6.0'])
 end
 
 group :development do
-  gem 'travis'
-  gem 'travis-lint'
-  gem 'travish'
-  gem 'puppet-blacksmith'
-  gem 'guard-rake'
   gem 'pry'
-  gem 'pry-byebug'
   gem 'pry-doc'
-
-  # `listen` is a dependency of `guard`
-  # from `listen` 3.1+, `ruby_dep` requires Ruby version >= 2.2.3, ~> 2.2
-  gem 'listen', '~> 3.0.6'
 end
 
 group :system_tests do
   gem 'beaker'
   gem 'beaker-rspec'
-  gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.12')
+  gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', ['>= 1.17.0', '< 2.0.0'])
 end

README.md

@@ -6,21 +6,33 @@
 
 #### Table of Contents
 
-1. [Overview](#overview)
-2. [Module Description - What the module does and why it is useful](#module-description)
-3. [Setup - The basics of getting started with simp-network](#setup)
+<!-- vim-markdown-toc GFM -->
+
+  * [Overview](#overview)
+  * [This is a SIMP module](#this-is-a-simp-module)
+  * [Module Description](#module-description)
+  * [Setup](#setup)
     * [What simp-network affects](#what-simp-network-affects)
-4. [Usage - Configuration options and additional functionality](#usage)
+  * [Usage](#usage)
     * [Basic Usage](#basic-usage)
-5. [Limitations - OS compatibility, etc.](#limitations)
-6. [Development - Guide for contributing to the module](#development)
-      * [Acceptance Tests - Beaker env variables](#acceptance-tests)
+      * [Set global networking parameters](#set-global-networking-parameters)
+      * [Manage a network interface](#manage-a-network-interface)
+      * [Set up a bridge bound to an interface](#set-up-a-bridge-bound-to-an-interface)
+* [Limitations](#limitations)
+  * [Development](#development)
+    * [Unit tests](#unit-tests)
+    * [Acceptance tests](#acceptance-tests)
+
+<!-- vim-markdown-toc -->
 
 ## Overview
 
 This module assists users in managing network interfaces on their system.
 
+See [REFERENCE.md](./REFERENCE.md) for API documentation.
+
 ## This is a SIMP module
+
 This module is a component of the [System Integrity Management Platform](https://simp-project.com)
 
 If you find any issues, please submit them via [JIRA](https://simp-project.atlassian.net/).