Skip to content
This repository has been archived by the owner on Jan 30, 2024. It is now read-only.

Commit

Permalink
Add puppet-apply-dev and wrap with govuk_puppet
Browse files Browse the repository at this point in the history
This commit moves the incantations for running puppet in the dev VM into
`tools/puppet-apply-dev`, and makes `govuk_puppet` just a wrapper for this
script in the dev environment.

This also simplifies changes to this `puppet-apply-dev` because the version of
`govuk_puppet` that comes preinstalled on the Vagrant basebox can also be a
wrapper around this file, meaning that changes less frequently require
rebuilding the basebox.
  • Loading branch information
nickstenning committed Dec 17, 2012
1 parent 31e22bf commit 7faa045
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
6 changes: 1 addition & 5 deletions modules/puppet/files/govuk_puppet_development
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
#!/bin/sh
cd /var/govuk/puppet

# Filter warnings about 'storeconfigs' not being set -- we don't currently
# attempt to test stored config configuration on the dev vm
exec sudo RUBYOPT="-W0" puppet apply manifests/site.pp "$@" | egrep -v "warning:.+storeconfigs"
exec sh /var/govuk/puppet/tools/puppet-apply-dev "$@"
9 changes: 9 additions & 0 deletions tools/puppet-apply-dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh
cd "$(dirname "$0")"
cd ..

bundle install --quiet

# Filter warnings about 'storeconfigs' not being set -- we don't currently
# attempt to test stored config configuration on the dev vm
exec sudo RUBYOPT="-W0" puppet apply manifests/site.pp "$@" | egrep -v "warning:.+storeconfigs"

0 comments on commit 7faa045

Please sign in to comment.