From 0215d430334b5f155dc0f6c193ed0103672d3069 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 1 Apr 2015 16:01:51 -0700
Subject: always use full domain for FACTOR_fqdn (closes #6700)

---
 bin/puppet_command | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/puppet_command b/bin/puppet_command
index bc4bfc5b..ce56fe51 100755
--- a/bin/puppet_command
+++ b/bin/puppet_command
@@ -132,7 +132,7 @@ def puppet_apply(options={}, &block)
   options = {:verbosity => @verbosity, :tags => @tags}.merge(options)
   manifest = options[:manifest] || SITE_MANIFEST
   modulepath = options[:module_path] || SITE_MODULES + CUSTOM_MODULES
-  fqdn = hiera_file['domain']['name']
+  fqdn = hiera_file['domain']['full']
   domain = hiera_file['domain']['full_suffix']
   Dir.chdir(PUPPET_DIRECTORY) do
     return run("FACTER_fqdn='#{fqdn}' FACTER_domain='#{domain}' #{PUPPET_BIN} apply #{custom_parameters(options)} --modulepath='#{modulepath}' #{PUPPET_PARAMETERS} #{manifest}", &block)
-- 
cgit v1.2.3