diff options
| author | Luke Kanies <luke@madstop.com> | 2009-08-01 12:45:55 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-08-02 17:37:27 +1000 |
| commit | 7e5b56212eef22be381a480dcaf38b33620674dd (patch) | |
| tree | 1315c26a67e3d84f87830dacab726ea30ce818af /lib/puppet/configurer.rb | |
| parent | 97274ad976e3584ae850ad91cc886fae1dcdbbc6 (diff) | |
| download | puppet-7e5b56212eef22be381a480dcaf38b33620674dd.tar.gz puppet-7e5b56212eef22be381a480dcaf38b33620674dd.tar.xz puppet-7e5b56212eef22be381a480dcaf38b33620674dd.zip | |
Adding #2477 - puppet can apply provided catalogs
This provides the other half of #2440 - you can
compile catalogs into json with puppetmasterd,
and now you can take those json catalogs and apply
them.
This allows you to use whatever mechanism you want
to ship the catalogs around.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet/configurer.rb')
| -rw-r--r-- | lib/puppet/configurer.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb index 8ec0b0055..81845f5cf 100644 --- a/lib/puppet/configurer.rb +++ b/lib/puppet/configurer.rb @@ -130,7 +130,9 @@ class Puppet::Configurer def run(options = {}) prepare() - unless catalog = retrieve_catalog + if catalog = options[:catalog] + options.delete(:catalog) + elsif ! catalog = retrieve_catalog Puppet.err "Could not retrieve catalog; skipping run" return end |