Skip to content

Commit

Permalink
(GH-3310) Sync core types and providers for apply
Browse files Browse the repository at this point in the history
Previously when puppet 5 agents were around we stopped syncing core types and providers because they were conflicting with builtin types. We assumed that we could just use these on agents. For the most part this works, but for the local transport when using bundled-ruby this is not the case. This commit updates apply to sync builtin types and providers. This will result in slightly larget pluginsync tar archives and opens up potential issues for puppet agent incompatabilities between the core types shipped with bolt vs what may be on the agent bolt is targetting. However this risk should be quite small compared with the complexity of trying to handle bundled-ruby case differently for apply.

!bug

* **Pluginsync builtin bolt content** [#GH-3310](GH-3310)

  Previously we were not pluginsyncing builtin content to avoid
  conflicting with puppet 5 builtin types. This was breaking assumptions
  for bundled-ruby config and should no longer be an issue with modern
  agents.
  • Loading branch information
donoghuc committed May 10, 2024
1 parent 7e8cede commit 7c2c35d
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions lib/bolt/pal.rb
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,12 @@ def with_bolt_executor(executor, inventory, pdb_client = nil, applicator = nil,
inventory,
executor,
full_modulepath,
# Skip syncing built-in plugins, since we vendor some Puppet 6
# versions of "core" types, which are already present on the agent,
# but may cause issues on Puppet 5 agents.
user_modulepath,
# Sync builtin types etc. Previously we were not doing this due to issues with puppet 5
# agents. Now that core types and providers are separated into modules for puppet 6 and
# newer we can safely sync them again. This will result in slightly larger pluginsync
# tar archives but it will handle the case where bundled-ruby over local transport is
# used.
full_modulepath,
@project,
pdb_client,
@hiera_config,
Expand Down

0 comments on commit 7c2c35d

Please sign in to comment.