diff options
| -rwxr-xr-x | bin/dependencies | 2 | ||||
| -rwxr-xr-x | bin/deploy | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/bin/dependencies b/bin/dependencies index 4330730..3a47a8e 100755 --- a/bin/dependencies +++ b/bin/dependencies @@ -5,7 +5,7 @@ # Parameters BASENAME="`basename $0`" -DEPLOY_DEPENDENCIES="rsync puppet-common hiera-eyaml" +DEPLOY_DEPENDENCIES="rsync puppet-common hiera-eyaml r10k" DEVELOP_DEPENDENCIES="git mr whois hiera-eyaml" # Additional wheezy dependencies if not using puppet-common from wheezy-backports @@ -57,6 +57,15 @@ if [ -d "$BASEDIR/puppet/files/patches/$DIST" ]; then ) fi +# Check for Puppetfile +if [ -e "$BASEDIR/Puppetfile" ]; then + if which r10k &> /dev/null; then + ( cd $BASEDIR && $SUDO r10k puppetfile install -v ) + elif which librarian-puppet &> /dev/null; then + ( cd $BASEDIR && $SUDO librarian-puppet install ) + fi +fi + # Run puppet apply PUPPET_OPTS="--confdir=$BASEDIR --modulepath=$BASEDIR/modules" LC_ALL=C $SUDO puppet apply $PUPPET_OPTS $PUPPET_MANIFEST |