Skip to content

Commit

Permalink
(SIMP-7487) Add EL8 support (#62)
Browse files Browse the repository at this point in the history
- Via updated acceptance tests, verified that the existing
  configuration worked on EL8 and that EL7 and EL8 interoperate.
- Update the upper bound of simp-simplib to < 5.0.0
- Add REFERENCE.md

SIMP-7487 #close
SIMP-7488 #close
SIMP-7436 #close
SIMP-7383 #close
  • Loading branch information
lnemsick-simp authored and trevor-vaughan committed Jan 15, 2020
1 parent 9034d32 commit 67d5cfa
Show file tree
Hide file tree
Showing 28 changed files with 1,637 additions and 321 deletions.
3 changes: 3 additions & 0 deletions .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ fixtures:
augeasproviders_grub: https://github.com/simp/augeasproviders_grub
compliance_markup: https://github.com/simp/pupmod-simp-compliance_markup
concat: https://github.com/simp/puppetlabs-concat
firewalld:
repo: https://github.com/simp/pupmod-voxpupuli-firewalld
ref: v4.1.0
haveged: https://github.com/simp/pupmod-simp-haveged
iptables: https://github.com/simp/pupmod-simp-iptables
logrotate: https://github.com/simp/pupmod-simp-logrotate
Expand Down
32 changes: 16 additions & 16 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -149,8 +149,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:
Expand All @@ -159,26 +159,26 @@ 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'
- 'bundle exec rake beaker:suites[default,default]'

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'
- 'BEAKER_fips=yes bundle exec rake beaker:suites[default,default]'

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]'

pup5.5.10-oel-fips:
<<: *pup_5_5_10
pup5.5.16-oel-fips:
<<: *pup_5_5_16
<<: *acceptance_base
<<: *only_with_SIMP_FULL_MATRIX
script:
Expand All @@ -188,10 +188,10 @@ pup6:
<<: *pup_6
<<: *acceptance_base
script:
- 'bundle exec rake beaker:suites'
- 'bundle exec rake beaker:suites[default,default]'

pup6-fips:
<<: *pup_6
<<: *acceptance_base
script:
- 'BEAKER_fips=yes bundle exec rake beaker:suites'
- 'BEAKER_fips=yes bundle exec rake beaker:suites[default,default]'
6 changes: 5 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
* Fri Aug 02 2019 Robert Vincent <pillarsdotnet@gmail.com> - 6.3.1-0
* Fri Jan 10 2020 Liz Nemsick <lnemsick.simp@gmail.com> - 6.4.0-0
- Add EL8 support
- Update the upper bound of simp-simplib to < 5.0.0

* Fri Aug 02 2019 Robert Vincent <pillarsdotnet@gmail.com> - 6.4.0-0
- Support puppetlabs/concat 6.x.

* Thu Aug 01 2019 Mike Renfro <renfro@tntech.edu> - 6.3.0-0
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ 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
Expand All @@ -26,5 +26,5 @@ 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
25 changes: 22 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ If you find any issues, they can be submitted to our [JIRA](https://simp-project

Please read our [Contribution Guide](https://simp.readthedocs.io/en/stable/contributors_guide/index.html).

## Work in Progress
## Module Description

Please excuse us as we transition this code into the public domain.
This module configures rsync for sharing large files that would be problematic to
share using the native Puppet fileserving type.

Downloads, discussion, and patches are still welcome!
## Setup

### Configuring Host as Server and Client

Expand Down Expand Up @@ -50,3 +51,21 @@ NOTE: If not using stunnel for the server/client connections, both values for
`rsync::server::trusted_nets` and `rsync::server::global::trusted_nets` will
need to match, as well as the `trusted_nets` values for any `rsync::server::section`
resources. These all default to '127.0.0.1' for stunnel usage.

## Reference

Please refer to the [REFERENCE.md](./REFERENCE.md).

## Limitations

SIMP Puppet modules are generally intended for use on Red Hat Enterprise
Linux and compatible distributions, such as CentOS. Please see the
[`metadata.json` file](./metadata.json) for the most up-to-date list of
supported operating systems, Puppet versions, and module dependencies.

## Development

Please read our [Contribution Guide](https://simp.readthedocs.io/en/stable/contributors_guide/index.html).

Visit the project homepage on [GitHub](https://simp-project.com),
and look at our issues on [JIRA](https://simp-project.atlassian.net/).
Loading

0 comments on commit 67d5cfa

Please sign in to comment.