fix

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>

Vagrantfile

@@ -1,6 +1,6 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
-# Time-stamp: <Fri 2019-02-01 16:12 svarrette>
+# Time-stamp: <Fri 2019-02-01 21:28 svarrette>
 ###########################################################################################
 #              __     __                          _    __ _ _
 #              \ \   / /_ _  __ _ _ __ __ _ _ __ | |_ / _(_) | ___
@@ -150,8 +150,8 @@ if File.exist?(config_file)
 end
 abort "Undefined settings" if settings.nil?
 
-puts settings.to_yaml
-exit 0
+# puts settings.to_yaml
+# exit 0
 
 
 ############################################################
@@ -205,7 +205,7 @@ end
 
 hiera_locals_yaml = File.join(TOP_PUPPET_DIR, 'hieradata', 'locals.yaml')
 hiera_locals_erb = %Q{
-# Custom Hiera values for Puppet Slurm
+# Local Hiera values for Puppet Slurm
 ---
 slurm::clustername: '<%= slurm[:clustername] %>'
 slurm::controlmachine: '<%= slurm[:controlmachine] %>'

tests/vagrant/puppet/Makefile

@@ -0,0 +1,40 @@
+##################################################################################
+# Makefile - Configuration file for GNU make (http://www.gnu.org/software/make/)
+# Time-stamp: <Tue 2019-01-29 21:55 svarrette>
+#
+# Copyright (c) 2018 Sebastien Varrette <Sebastien.Varrette@uni.lu>
+#
+############################## Variables Declarations ############################
+
+CURDIR = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+MODULES_DIR   = modules
+MANIFESTS_DIR = manifests
+HIERADATA_DIR = hieradata
+
+MODULES = $(sort $(dir $(wildcard $(MODULES_DIR)/*/)))
+
+# all: setup
+
+# .PHONY: setup
+# setup:
+# 	r10k puppetfile install -v
+# 	$(MAKE) check
+
+# check:
+# 	puppet module --modulepath $(CURDIR)/modules --color true list --tree
+
+print:
+	@echo "MODULES = $(MODULES)"
+
+clean:
+	@if [ -f "$(HIERADATA_DIR)/custom.yaml" ]; then \
+		echo "=> remove custom hiera"; \
+		rm -f $(HIERADATA_DIR)/custom.yaml;\
+	fi
+
+distclean: clean
+	@if [ -n "$(MODULES)" ]; then \
+		echo "=> remove puppet modules"; \
+		echo "(simulating) rm -rf $(MODULES)";\
+	fi