diff options
author | John Ferlito <johnf@inodes.org> | 2008-03-14 13:58:24 +1100 |
---|---|---|
committer | John Ferlito <johnf@inodes.org> | 2008-03-14 13:58:24 +1100 |
commit | 388cf7c3df7ce26e953949ed6fe63d76cbbb3691 (patch) | |
tree | e33337e22037ac63d56b6e314792a0bbd68c478c /test | |
parent | 872ced7126877dd74a051d8b38ae29920ad0d9b2 (diff) | |
download | puppet-388cf7c3df7ce26e953949ed6fe63d76cbbb3691.tar.gz puppet-388cf7c3df7ce26e953949ed6fe63d76cbbb3691.tar.xz puppet-388cf7c3df7ce26e953949ed6fe63d76cbbb3691.zip |
Regression in :node_name functionality
When :node_name="cert" is specified the 'hostname' fact should be set to the SSL certificate common name instead of the results from facter. I've extended this to also set 'domain' and 'fqdn' since that makes a lot of sense to me. This fixes a regression introduced in SVN#1673
Diffstat (limited to 'test')
-rwxr-xr-x | test/network/handler/master.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb index 25117030e..88bfe6b7e 100755 --- a/test/network/handler/master.rb +++ b/test/network/handler/master.rb @@ -76,8 +76,15 @@ class TestMaster < Test::Unit::TestCase Puppet[:node_name] = "cert" # Make sure we get the fact data back when nothing is set - facts = {"hostname" => "fact_hostname", "ipaddress" => "fact_ip"} - certname = "cert_hostname" + facts = { + "hostname" => "fact_hostname", + "domain" => "fact_domain", + "fqdn" => "fact_hostname.fact_domain", + "ipaddress" => "fact_ip" + } + certhostname = "cert_hostname" + certdomain = "cert_domain" + certname = certhostname + "." + certdomain certip = "cert_ip" resname, resip = master.send(:clientname, nil, nil, facts) |