Skip to content

(#15668) Don't pluginsync for apply#968

Merged
pcarlisle merged 3 commits intopuppetlabs:3.xfrom
zaphod42:ticket/3.x/15668-no-pluginsync-on-apply
Aug 2, 2012
Merged

(#15668) Don't pluginsync for apply#968
pcarlisle merged 3 commits intopuppetlabs:3.xfrom
zaphod42:ticket/3.x/15668-no-pluginsync-on-apply

Conversation

@zaphod42
Copy link
Contributor

After trying out having apply pluginsync there have been several unwanted
side effects. This commit removes the apply command from pluginsyncing and
so leaves only agent and device still performing pluginsync.

In addition this also pulls out the configurer's dependency on
Puppet[:pluginsync] so that there is only one way of controlling whether the
Configurer will pluginsync.

pcarlisle and others added 2 commits July 25, 2012 11:21
After trying out having apply pluginsync there have been several
unwanted side effects. This commit removes the apply command from
pluginsyncing and so leaves only agent and device still performing
pluginsync.
Previously the Configurer took a parameter, :skip_plugin_download, which
whould cause it to not trigger a pluginsync. At the same time the
pluginsync code (Downloader) would look at Puppet[:pluginsync] to decide
whether it should actually pluginsync or not.

This changes it so that there is only Pupppet[:pluginsync] which is
passed through to the Configurer as a :pluginsync parameter when the
Configurer is called. Now all callers can be explicit about doing the
pluginsync and the Configurer is less dependent on Puppet settings.
Copy link
Contributor

Choose a reason for hiding this comment

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

This is the only test that checks the ordering of files in the plugin mount. That should be preserved somehow, using master/agent or the plugin face.

The previous version of this test relied on using puppet apply to check
that the module path order was preserved in deciding the files to use
from a pluginsync. Without apply performaning a pluginsync that was not
possible anymore, but this test is still useful.

This replaces the previous test with a new one that uses the master and
the agent for performing a pluginsync and checking what files the agent
recieves.
pcarlisle added a commit that referenced this pull request Aug 2, 2012
* github.com:puppetlabs/puppet:
  (#15668) Replace test for order of files in pluginsync
  (#15668) Use only one way of triggering pluginsync
  (#15668) Don't pluginsync for apply
@pcarlisle pcarlisle merged commit f58ee35 into puppetlabs:3.x Aug 2, 2012
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.

2 participants