Skip to content

Commit

Permalink
(SIMP-7443) Update SSSD to EL8 (#82)
Browse files Browse the repository at this point in the history
- Added EL8 support
- Updated new and deprecated variables in various providers where
  appropriate.
- Added new variables for AD provider.
- Added ifp to list of services in service type
- Added installation of sssd-dbus package if ifp enabled
- Added support for simplib version 4.0
- Update spec_helper so test will run on servers in FIPS mode
- Updated Gemfile dependencies
- Added 'files' to list of  providers

SIMP-7443 #close
SIMP-7503 #close
SIMP-7496 #close
SIMP-7498 #close
  • Loading branch information
jeannegreulich authored Feb 27, 2020
1 parent daf4227 commit 60dd96c
Show file tree
Hide file tree
Showing 67 changed files with 1,706 additions and 1,533 deletions.
2 changes: 2 additions & 0 deletions .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,7 @@ fixtures:
simp_options: https://github.com/simp/pupmod-simp-simp_options
ssh: https://github.com/simp/pupmod-simp-ssh
systemd: https://github.com/simp/puppet-systemd
# Fixtures for ldap accectance test
simp_openldap: https://github.com/simp/pupmod-simp-simp_openldap
symlinks:
sssd: "#{source_dir}"
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
.yardoc
dist/
pkg/
spec/fixtures/
spec/fixtures/modules
spec/fixtures/manifests
spec/fixtures/hieradata/hiera.yaml
spec/rp_env/
!/spec/hieradata/default.yaml
!/spec/fixtures/site.pp
.rspec_system
.vagrant/
.bundle/
Expand Down
57 changes: 35 additions & 22 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.5 TBD***
# PE 2018.1 5.5.8 2.4.5 2020-05 (LTS)***
# SIMP 6.3 5.5.16 2.4.5 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
Expand Down 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 @@ -153,8 +153,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 @@ -163,55 +163,68 @@ 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[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[default]'
- 'BEAKER_fips=yes bundle exec rake beaker:suites[default,default]'

pup5.5.10-ad:
<<: *pup_5_5_10
pup5.5.16-ad:
<<: *pup_5_5_16
<<: *acceptance_base
script:
- 'bundle exec rake beaker:suites[ad]'
- 'bundle exec rake beaker:suites[ad,default]'
retry: 1

pup5.5.10-ad-fips:
<<: *pup_5_5_10
pup5.5.16-ldap:
<<: *pup_5_5_16
<<: *acceptance_base
script:
- 'bundle exec rake beaker:suites[ldap,default]'
retry: 1
pup5.5.16-ad-fips:
<<: *pup_5_5_16
<<: *acceptance_base
<<: *only_with_SIMP_FULL_MATRIX
script:
- 'BEAKER_fips=yes bundle exec rake beaker:suites[ad]'
retry: 1


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

pup5.5.10-oel-ad:
<<: *pup_5_5_10
pup5.5.16-oel-ad:
<<: *pup_5_5_16
<<: *acceptance_base
<<: *only_with_SIMP_FULL_MATRIX
script:
- 'bundle exec rake beaker:suites[ad,oel]'
retry: 1

pup5.5.16-oel-ldap:
<<: *pup_5_5_16
<<: *acceptance_base
<<: *only_with_SIMP_FULL_MATRIX
script:
- 'bundle exec rake beaker:suites[ldap,oel]'

pup6:
<<: *pup_6
<<: *acceptance_base
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.4
2.4.5
14 changes: 14 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
* Tue Jan 21 2020 Jeanne Greulich <[email protected]> - 6.3.0-0
- Added EL8 support
- Removed requirement for sssd domain entry for el8 and SSSD V2 since
using the implicit files provider is valid and even recommended
for performance by some. An sssd domain is still required for
el6 and el7.
- Automatically include the service section if the service is included in
sssd::services.
- Removed deprecated variables from ldap provider for EL8.
- Added new variables for providers in EL8.
- Added ifp to list of services in service type
- Added files to types of providers
- Added support for simplib version 4.0

* Tue Jun 04 2019 steven.pritchard <[email protected]> - 6.2.0-0
- Add v2 compliance_markup data

Expand Down
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,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 @@ -29,5 +29,6 @@ group :system_tests do
gem 'beaker'
gem 'beaker-rspec'
gem 'beaker-windows'
gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.13')
# Need 1.18.2 for windows updates
gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', ['>= 1.18.2', '< 2.0.0'])
end
Loading

0 comments on commit 60dd96c

Please sign in to comment.