diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2014-03-04 13:26:05 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2014-03-04 13:26:05 -0300 |
commit | ebb7769b363f8c3604f1ad20afd73677a638bbf5 (patch) | |
tree | f08430556c35c522e0261ef93a83e4684e07c5da /Makefile | |
parent | 846876934b55e68554f935cb5101cb866d2f1cd6 (diff) | |
download | puppet-bootstrap-ebb7769b363f8c3604f1ad20afd73677a638bbf5.tar.gz puppet-bootstrap-ebb7769b363f8c3604f1ad20afd73677a638bbf5.tar.bz2 |
Makefile cleanup
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -14,8 +14,9 @@ # Place - Suite 330, Boston, MA 02111-1307, USA # -REPO = git://git.sarava.org/puppet-bootstrap.git -CWD = $(shell pwd) +REPO = git://git.sarava.org/puppet-bootstrap.git +CWD = $(shell pwd) +PUPPET = FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --confdir="$(CWD)" --modulepath=modules all: clean remote modules @@ -36,10 +37,10 @@ remote: config: $(EDITOR) hiera/bootstrap.yaml - FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --confdir="$(CWD)" --modulepath=modules manifests/classes/configurator.pp + $(PUPPET) manifests/classes/configurator.pp apply: - FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --confdir="$(CWD)" --modulepath=modules manifests/$(stage).pp + $(PUPPET) manifests/$(stage).pp clean: rm -rf modules |