diff options
| author | elijah <elijah@riseup.net> | 2015-04-01 16:01:51 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-04-01 16:01:51 -0700 |
| commit | 0215d430334b5f155dc0f6c193ed0103672d3069 (patch) | |
| tree | d45535f4e5a937e695f7f3d9319421a2eaad080e | |
| parent | 63a32dc933242bafef15aa2e61baa04bf5b7f38f (diff) | |
always use full domain for FACTOR_fqdn (closes #6700)
| -rwxr-xr-x | bin/puppet_command | 2 |
1 files changed, 1 insertions, 1 deletions
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) |