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.

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

Added ensure_resource and ensure_packages to avoid collisions #26

Merged
merged 8 commits into from
Nov 3, 2016

Conversation

dannygoulder
Copy link
Contributor

Needs newer version of puppetlabs-stdlib which I have added to the metadata.json.

Puppetlabs-stdlib 4.x only works with Puppet 3.x which is already a minimum requirement for this module.

@@ -1,20 +1,18 @@
# See README.md for usage information
class sssd::install (
$ensure = $sssd::ensure,
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 see why this change is necessary. The old variable name seems fine.
I would't want to break anyone's configuration, that is currently using this class directly...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just realised my error here - think I merged more than I should have from the earlier PR. Also probably explains why the variable wasn't picked up above.

I'll clean that up tomorrow.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All cleaned up now.

@@ -123,7 +123,9 @@
validate_re($service_ensure, '^running|true|stopped|false$')

anchor { 'sssd::begin': } ->
class { '::sssd::install': } ->
class { '::sssd::install':
ensure => $sssd_package_ensure,
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think that reading this var from the install class is cleaner...
Can we leave this code alone? Is there a reason to change it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

my local tests were failing because the var wasn't being read from the install class. Is it a scoping issue with my version of Puppet (4.5)? Agree that it's cleaner that way. Maybe i can work around it in another way

@@ -6,7 +6,7 @@
$extra_packages_ensure = $sssd::extra_packages_ensure,
) {

ensure_packages([$sssd_package],{ ensure => $ensure })
ensure_packages({$sssd_package => { 'ensure' => $ensure } } )
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is causing Puppet 3.8.7 with ruby 1.9.3 to fail in a strange way. need to check on correct syntax as this works on ruby 2.1

@sgnl05
Copy link
Owner

sgnl05 commented Nov 2, 2016

This looks good too me. @edestecd do you have anything to add or should we just merge this?

@edestecd
Copy link
Collaborator

edestecd commented Nov 3, 2016

Everything looks great!
@dannygoulder squashing all your commits to one or two commits would be nice, if you are comfortable with that...

Looks like github can squash for us, if you prefer...

@dannygoulder
Copy link
Contributor Author

GitHub squash is a good plan. Cheers

On 3 Nov 2016, at 4:20 pm, Chris Edester [email protected] wrote:

Everything looks great!
@dannygoulder squashing all your commits to one or two commits would be nice, if you are comfortable with that...

Looks like github can squash for us, if you prefer...


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.

@edestecd edestecd merged commit c986a94 into sgnl05:master Nov 3, 2016
@edestecd
Copy link
Collaborator

edestecd commented Nov 3, 2016

@dannygoulder thanks for the contribution!

@dannygoulder
Copy link
Contributor Author

You're welcome. Thanks for the great work on the module.

On 4 Nov 2016, at 12:06 am, Chris Edester [email protected] wrote:

@dannygoulder thanks for the contribution!


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants