summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/interpreter.rb
diff options
context:
space:
mode:
authorlutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0>2006-03-31 23:33:17 +0000
committerlutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0>2006-03-31 23:33:17 +0000
commitc7ae8396c420f862cda8f6121e505473abfd3e64 (patch)
treeeb6a16b9ff5750c5fff078ce8795f548e676fb8f /lib/puppet/parser/interpreter.rb
parent9b1e8d55363aa67e9e981b7977ed6eded8026b68 (diff)
downloadpuppet-c7ae8396c420f862cda8f6121e505473abfd3e64.tar.gz
puppet-c7ae8396c420f862cda8f6121e505473abfd3e64.tar.xz
puppet-c7ae8396c420f862cda8f6121e505473abfd3e64.zip
Manifests can now specify node names with fully qualified domain names, too.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1047 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser/interpreter.rb')
-rw-r--r--lib/puppet/parser/interpreter.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index 73234fbf9..c432e39a8 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -165,10 +165,12 @@ module Puppet
# but for now just make a simple array
names = [client]
- # if the client name is fully qualied (which is normally will be)
- # add the short name
+ # Make sure both the fqdn and the short name of the
+ # host can be used in the manifest
if client =~ /\./
names << client.sub(/\..+/,'')
+ else
+ names << "#{client}.#{facts['domain']}"
end
begin