(PUP-8766) device $LOAD_PATH and environment handling#7242
Merged
DavidS merged 5 commits intopuppetlabs:5.5.xfrom Dec 7, 2018
Merged
(PUP-8766) device $LOAD_PATH and environment handling#7242DavidS merged 5 commits intopuppetlabs:5.5.xfrom
DavidS merged 5 commits intopuppetlabs:5.5.xfrom
Conversation
DavidS
changed the title
Contributor
Author
|
This is only a first draft of the changes that seem to be necessary to get this fixed. I've done only cursory manual testing, and will do a full manual test, and update the unit tests before submitting this for a merge. @joshcooper I'd appreciate feedback on this approach, if this matches what you expected from the conversation in the ticket, and if you see anything that needs improvement |
|
CLA signed by all contributors. |
DavidS
force-pushed
the
pup-8766-device-load-path
branch
from
96f811b to
b821073
Compare
DavidS
changed the title
Contributor
Author
|
The log below shows manual testing how the current |
Contributor
Author
|
The downside here is that puppet device is now ignoring |
This change groups related options in the help text to improve legibility.
Previous to this commit, `puppet device` would use the proxy agent's `:libdir` to load all code, since we changed the `:vardir` setting, but not the `:libdir`. While `Puppet::Settings` has hooks to change the `$LOAD_PATH` when `:libdir` changes, those do not trigger when the change is effected through a interpolation, like in this case. By setting the `:libdir` explicitely the hook is triggered, and the `$LOAD_PATH` gets updated. This commit also removes the `device` subcommand from the CLI's default `$LOAD_PATH` processing.
Contributor
|
its really hard to comment on this, the approach looks sane. Not being able to use the --libdir feels like a blocker |
Contributor
Author
|
@tphoney about to wrap-up a second iteration of this, fixing the libdir issue |
When running `puppet device` in agent mode, a pluginsync needs to happen before the device is loaded. For the non-agent modes `--facts`, `--resource`, and `--apply`, doing no pluginsync is useful since they are used in local workflows (like testing), and for a quicker turnaround when exploring devices.
DavidS
force-pushed
the
pup-8766-device-load-path
branch
from
b821073 to
83d460b
Compare
Contributor
Author
|
There we go. PS: the "force-pushed" link also includes the changes on the 5.5.x branch since I rebased the entire thing. |
Contributor
Author
|
This is now ready for final reviews. |
This allows overriding the per-device libdir to enable local and testing scenarios where pluginsync doesn't make sense.
This commit uses a "remote" environment, instead of a full one. This allows the override to work, even if we do not have that environment's codedir available locally. In the case of a full puppet run, the `Configurer` does additional work to update and sync the plugindir vs what the ENC specifies. # Conflicts: # spec/unit/application/device_spec.rb
DavidS
force-pushed
the
pup-8766-device-load-path
branch
from
83d460b to
e1a810b
Compare
tphoney
approved these changes
Dec 7, 2018
DavidS
added a commit
to DavidS/puppet
that referenced
this pull request
Dec 11, 2018
The changes in PUP-8766/puppetlabs#7242 removed plugin loading from a local environment for `puppet device`, even in the cases where local content is supposed to be used. This change reverts the part of puppetlabs#7242 that was causing this. By allowing puppet to load local content for '--apply', '--facts' and '--resource', those run modes can now work stand alone again.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.