From 4a3259443d932b3eb2b5fc2b07e932d422b14eaa Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 25 Nov 2013 15:18:35 -0800 Subject: [PATCH] provisioners/puppet: make the output a bit clearer --- plugins/provisioners/puppet/provisioner/puppet_server.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/provisioners/puppet/provisioner/puppet_server.rb b/plugins/provisioners/puppet/provisioner/puppet_server.rb index e575b6fc8..8cacbbb57 100644 --- a/plugins/provisioners/puppet/provisioner/puppet_server.rb +++ b/plugins/provisioners/puppet/provisioner/puppet_server.rb @@ -67,8 +67,6 @@ module VagrantPlugins options << "--color=false" end - options = options.join(" ") - # Build up the custom facts if we have any facter = "" if !config.facter.empty? @@ -80,6 +78,7 @@ module VagrantPlugins facter = "#{facts.join(" ")} " end + options = options.join(" ") command = "#{facter}puppet agent #{options} --server " + "#{config.puppet_server} --detailed-exitcodes || [ $? -eq 2 ]"