diff options
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/puppet_command | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/puppet_command b/bin/puppet_command index e1752ec2..5e690bef 100755 --- a/bin/puppet_command +++ b/bin/puppet_command @@ -94,8 +94,9 @@ def puppet_apply(options={}, &block) options = {:verbosity => @verbosity, :tags => @tags}.merge(options) manifest = options[:manifest] || SITE_MANIFEST fqdn = hiera_file['domain']['name'] + domain = hiera_file['domain']['full_suffix'] Dir.chdir(PUPPET_DIRECTORY) do - return run("FACTER_fqdn='#{fqdn}' #{PUPPET_BIN} apply #{custom_parameters(options)} #{PUPPET_PARAMETERS} #{manifest}", &block) + return run("FACTER_fqdn='#{fqdn}' FACTER_domain='#{domain}' #{PUPPET_BIN} apply #{custom_parameters(options)} #{PUPPET_PARAMETERS} #{manifest}", &block) end end @@ -213,4 +214,4 @@ Signal.trap("EXIT") do # but only after the child puppet process is also dead (I think). end -main()
\ No newline at end of file +main() |