Skip to content

Ensure resource attempt 2#87

Merged
jeffmccune merged 2 commits intopuppetlabs:masterfrom
bodepd:ensure_resource_attempt_2
Aug 16, 2012
Merged

Ensure resource attempt 2#87
jeffmccune merged 2 commits intopuppetlabs:masterfrom
bodepd:ensure_resource_attempt_2

Conversation

@bodepd
Copy link
Copy Markdown

@bodepd bodepd commented Aug 15, 2012

This pull request reverts the previously reverted commit from the ensure_resource pull request.

It also adds code for explicit function loading for the functions that ensure_resource depends on (which should resolve the 2.6.x failures)

Dan Bode added 2 commits August 15, 2012 15:56
The ensure_resource function actually calls two
other functions, create_resources and defined_with_param.

When calling Puppet functions from Ruby, you sometimes have
to load the functions manually if they have not been called
before.

This commit explicitly loads the functions that ensure_resource
depends on from within the function.
@jeffmccune
Copy link
Copy Markdown
Contributor

@bodepd

I'm still getting order-dependent test failures with Puppet 2.6. I spent quite a bit of effort on this yesterday afternoon and @pcarlisle chipped in a bit at the end of the day.

Do you have a need for these functions to work with Puppet 2.6 ? After sleeping on it last night I don't think it's worth the time and effort to continue maintaining backwards compatibility with 2.6.

I'd like to merge this into master, release stdlib 3.0.0 from master and establish the 2.x branch for Puppet 2.6 compatible features.

Thoughts?

@bodepd
Copy link
Copy Markdown
Author

bodepd commented Aug 16, 2012

@jeffmccune I am ok with that. Thanks for all of the time you have spent trying to get this into stdlib.I really appreciate it.

I may take a look at the order dependent issues what you ran into when I have a little more time.

@jeffmccune jeffmccune merged commit 5d99cdf into puppetlabs:master Aug 16, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants