Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Module to Puppet >= 4.X #40

Merged
merged 3 commits into from
May 18, 2017
Merged

Updated Module to Puppet >= 4.X #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dcbaa9
Updated Module to Puppet >= 4.X
May 17, 2017
0d5c40d
Changed default ruby to 2.1.9
May 17, 2017
9b437d6
Merge branch 'master' into master
sgnl05 May 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.7
2.1.9
51 changes: 1 addition & 50 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,11 @@
language: ruby

rvm:
- 1.9.3
- 2.1.0
- 2.1.9
- 2.3.1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont think they are using 2.3.1 yet and might skip it entirely for 2.4. Suggest removing this.


env:
matrix:
- PUPPET_GEM_VERSION="~> 3.1.0" CHECK=test
- PUPPET_GEM_VERSION="~> 3.2.0" CHECK=test
- PUPPET_GEM_VERSION="~> 3.3.0" CHECK=test
- PUPPET_GEM_VERSION="~> 3.4.0" CHECK=test
- PUPPET_GEM_VERSION="~> 3.5.0" CHECK=test
- PUPPET_GEM_VERSION="~> 3.6.0" CHECK=test
- PUPPET_GEM_VERSION="~> 3.7.0" CHECK=test
- PUPPET_GEM_VERSION="~> 3.8.0" CHECK=test
- PUPPET_GEM_VERSION="~> 3.8.0" CHECK=build DEPLOY_TO_FORGE=yes
- PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes" CHECK=test
- PUPPET_GEM_VERSION="~> 4.0.0" CHECK=test
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to explicitly support all releases of v4? I'm thinking of only supporting the current release and the two before it. Things really do change in minor versions and you'd be surprised how it can add it. It also greatly increases testing time.

- PUPPET_GEM_VERSION="~> 4.1.0" CHECK=test
- PUPPET_GEM_VERSION="~> 4.2.0" CHECK=test
Expand All @@ -36,44 +25,6 @@ bundler_args: '--without system_tests development'

script: 'SPEC_OPTS="--format documentation" bundle exec rake $CHECK'

matrix:
fast_finish: true
exclude:
- rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 3.1.0" CHECK=test
- rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 3.2.0" CHECK=test
- rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 3.3.0" CHECK=test
- rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 3.4.0" CHECK=test
- rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 3.8.0" CHECK=build DEPLOY_TO_FORGE=yes
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 4.9.0" CHECK=test
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 4" CHECK=test
- rvm: 2.3.1
env: PUPPET_GEM_VERSION="~> 3.1.0" CHECK=test
- rvm: 2.3.1
env: PUPPET_GEM_VERSION="~> 3.2.0" CHECK=test
- rvm: 2.3.1
env: PUPPET_GEM_VERSION="~> 3.3.0" CHECK=test
- rvm: 2.3.1
env: PUPPET_GEM_VERSION="~> 3.4.0" CHECK=test
- rvm: 2.3.1
env: PUPPET_GEM_VERSION="~> 3.5.0" CHECK=test
- rvm: 2.3.1
env: PUPPET_GEM_VERSION="~> 3.6.0" CHECK=test
- rvm: 2.3.1
env: PUPPET_GEM_VERSION="~> 3.7.0" CHECK=test
- rvm: 2.3.1
env: PUPPET_GEM_VERSION="~> 3.8.0" CHECK=test
- rvm: 2.3.1
env: PUPPET_GEM_VERSION="~> 3.8.0" CHECK=build DEPLOY_TO_FORGE=yes
- rvm: 2.3.1
env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes" CHECK=test

notifications:
email: false
deploy:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ end
if (puppetversion = ENV['PUPPET_GEM_VERSION'])
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we shouldn't need a version specified here at all. It will use the installed version or install the newest version if none is specified, which is what we want.

if puppetversion = ENV['PUPPET_GEM_VERSION']
  gem 'puppet', puppetversion, :require => false
else
  gem 'puppet', :require => false
end

gem 'puppet', puppetversion, :require => false
else
gem 'puppet', '~> 3.8', :require => false
gem 'puppet', '~> 4.9', :require => false
end

if RUBY_VERSION < '1.9'
Expand Down
65 changes: 16 additions & 49 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,61 +53,28 @@
# Flags to use with authconfig to disable auto-creation of home directories.
#
class sssd (
$ensure = $sssd::params::ensure,
$config = $sssd::params::config,
$sssd_package = $sssd::params::sssd_package,
$sssd_package_ensure = $sssd::params::sssd_package_ensure,
$sssd_service = $sssd::params::sssd_service,
$extra_packages = $sssd::params::extra_packages,
$extra_packages_ensure = $sssd::params::extra_packages_ensure,
$config_file = $sssd::params::config_file,
$config_template = $sssd::params::config_template,
$mkhomedir = $sssd::params::mkhomedir,
$manage_oddjobd = $sssd::params::manage_oddjobd,
$service_ensure = $sssd::params::service_ensure,
$service_dependencies = $sssd::params::service_dependencies,
$enable_mkhomedir_flags = $sssd::params::enable_mkhomedir_flags,
$disable_mkhomedir_flags = $sssd::params::disable_mkhomedir_flags,
$ensure_absent_flags = $sssd::params::ensure_absent_flags,
Enum['present', 'absent']$ensure = $sssd::params::ensure,
Hash $config = $sssd::params::config,
String $sssd_package = $sssd::params::sssd_package,
String $sssd_package_ensure = $sssd::params::sssd_package_ensure,
String $sssd_service = $sssd::params::sssd_service,
Array $extra_packages = $sssd::params::extra_packages,
$extra_packages_ensure = $sssd::params::extra_packages_ensure,
$config_file = $sssd::params::config_file,
String $config_template = $sssd::params::config_template,
Boolean $mkhomedir = $sssd::params::mkhomedir,
$manage_oddjobd = $sssd::params::manage_oddjobd,
Variant[Boolean, Enum['running', 'stopped']]$service_ensure = $sssd::params::service_ensure,
Array $service_dependencies = $sssd::params::service_dependencies,
Array $enable_mkhomedir_flags = $sssd::params::enable_mkhomedir_flags,
Array $disable_mkhomedir_flags = $sssd::params::disable_mkhomedir_flags,
$ensure_absent_flags = $sssd::params::ensure_absent_flags,
) inherits sssd::params {

validate_re($ensure, '^(present|absent)$',
"${ensure} is not supported for ensure.
Allowed values are 'present' and 'absent'.")

validate_string(
$sssd_package_ensure,
$sssd_package,
$sssd_service,
$config_template
)

validate_array(
$extra_packages,
$enable_mkhomedir_flags,
$disable_mkhomedir_flags,
$service_dependencies
)

validate_absolute_path(
$config_file
)

validate_bool(
$mkhomedir
)

validate_hash(
$config
)

validate_re($service_ensure, '^running|true|stopped|false$')

anchor { 'sssd::begin': } ->
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now is the time to get rid of all of these classes and the ancient bandaid of anchor'ing. We should put everything in one class.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't agree with putting every thing in one class. I think having separate classes makes the code more readable and easier to understand. Most of the puppetlabs modules take this approach.

As for the anchors, I agree. We should remove them and switch to using contain.

class { '::sssd::install': } ->
class { '::sssd::dependencies': } ->
class { '::sssd::config': } ~>
class { '::sssd::service': } ->
anchor { 'sssd::end': }

}
4 changes: 2 additions & 2 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sgnl05-sssd",
"version": "1.0.1",
"version": "2.0.0",
"author": "sgnl05",
"summary": "Install and configure SSSD",
"license": "GPL-3.0+",
Expand Down Expand Up @@ -31,7 +31,7 @@
}
],
"requirements": [
{"name":"puppet","version_requirement":">= 3.0.0 < 5.0.0" }
{"name":"puppet","version_requirement":">= 4.0.0 < 5.0.0" }
],
"dependencies": [
{"name":"puppetlabs/stdlib","version_requirement":">= 4.1.0 < 5.0.0"}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably bump stdlib to the latest at this point, which we will want for the data types.

https://github.com/puppetlabs/puppetlabs-stdlib#data-types

This will mean we also need to modify the .fixtures.yml

Expand Down