From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 6 Mar 2016 01:14:52 +0000 (-0300)
Subject: Deploy fixes
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=08bd8b75213f0efc9fd218e8c17358bb814c0fbe;p=puppet-bootstrap.git

Deploy fixes
---

diff --git a/bin/deploy b/bin/deploy
index 289f86c..6088edb 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -16,7 +16,7 @@ else
 fi
 
 # Set manifest
-PUPPET_MANIFEST="$BASEDIR/puppet/manifests/nodes/$FQDN.pp"
+PUPPET_MANIFEST="$BASEDIR/manifests/nodes/$FQDN.pp"
 if [ ! -e "$PUPPET_MANIFEST" ]; then
   PUPPET_MANIFEST="$BASEDIR/puppet/manifests/nodes/default.pp"
 fi
@@ -59,5 +59,5 @@ if [ -d "$BASEDIR/puppet/files/patches/$DIST" ]; then
 fi
 
 # Run puppet apply
-PUPPET_OPTS="--confdir=$BASEDIR/puppet --modulepath=$BASEDIR/puppet/modules"
+PUPPET_OPTS="--confdir=$BASEDIR --modulepath=$BASEDIR/modules"
 LC_ALL=C $SUDO puppet apply $PUPPET_OPTS $PUPPET_MANIFEST