From d08e3f7ab331faca9f1d5181e05eec1e0894d5ac Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 25 Nov 2013 15:28:17 -0800 Subject: [PATCH] provisioners/puppet: use better flags for one-time run --- plugins/provisioners/puppet/provisioner/puppet_server.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/provisioners/puppet/provisioner/puppet_server.rb b/plugins/provisioners/puppet/provisioner/puppet_server.rb index 8cacbbb57..7d85df1eb 100644 --- a/plugins/provisioners/puppet/provisioner/puppet_server.rb +++ b/plugins/provisioners/puppet/provisioner/puppet_server.rb @@ -79,13 +79,13 @@ module VagrantPlugins end options = options.join(" ") - command = "#{facter}puppet agent #{options} --server " + - "#{config.puppet_server} --detailed-exitcodes || [ $? -eq 2 ]" + command = "#{facter}puppet agent --onetime --no-daemonize #{options} " + + "--server #{config.puppet_server} --detailed-exitcodes || [ $? -eq 2 ]" @machine.ui.info I18n.t("vagrant.provisioners.puppet_server.running_puppetd") @machine.communicate.sudo(command) do |type, data| if !data.empty? - @machine.env.ui.info(data, :new_line => false, :prefix => false) + @machine.ui.info(data, :new_line => false, :prefix => false) end end end