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

(MAINT) Ensure dsc provider finds dsc resources during agent run #45

Merged
merged 1 commit into from
Sep 25, 2020
Merged

(MAINT) Ensure dsc provider finds dsc resources during agent run #45

merged 1 commit into from
Sep 25, 2020

Conversation

michaeltlombardi
Copy link
Contributor

Prior to this commit the dsc_base_provider used the LOAD_PATH
to find the appropriate Puppet module and retrieve the DSC
resources from it; this does not work in a puppet agent run,
because the resources are placed flatly on disc in lib/puppet
and lib/puppet_x, not per-module as with a puppet apply run.

This commit adds a handler to fall back on relative paths for
discovery in the case where the module cannot be found in the
LOAD_PATH.

@michaeltlombardi michaeltlombardi requested a review from a team as a code owner September 24, 2020 20:39
@michaeltlombardi michaeltlombardi marked this pull request as draft September 24, 2020 20:43
Prior to this commit the dsc_base_provider used the LOAD_PATH
to find the appropriate Puppet module and retrieve the DSC
resources from it; this does not work in a puppet agent run,
because the resources are placed flatly on disc in lib/puppet
and lib/puppet_x, not per-module as with a puppet apply run.

This commit adds a handler to fall back on relative paths for
discovery in the case where the module cannot be found in the
LOAD_PATH.
@michaeltlombardi michaeltlombardi marked this pull request as ready for review September 24, 2020 21:59
@michaeltlombardi
Copy link
Contributor Author

Validated that this change is functional with @moedes via Puppet agent runs; we should look to fast-track a release with this bugfix in place.

@DavidS DavidS merged commit 93f9de8 into puppetlabs:main Sep 25, 2020
@michaeltlombardi michaeltlombardi deleted the maint/main/make-base-provider-work-with-agent branch September 25, 2020 15:04
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