Monty Taylor 6260b48b9e Clean up codestyle in conditionals
Based on some earlier review feedback, add defaults for copy_puppet and
copy_hieradata so that we don't have to check if they are defined. Also,
split the and condition in when to be a list of conditions.

Change-Id: I68bd332bdfae6880b582203161798f709dc45a45
2016-01-14 15:39:25 -05:00
..
2016-01-14 15:39:25 -05:00