haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Puppet server host_name should be hostname [GH-1444]

This commit is contained in:
Mitchell Hashimoto 2013-03-17 22:26:44 -07:00
parent 2210765412
commit 9e80a55d7b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -24,6 +24,7 @@ BUG FIXES:
- Fix cross-device box adds for Windows. [GH-1424] - Fix cross-device box adds for Windows. [GH-1424]
- Fix minor issues with defaults of configuration of the shell - Fix minor issues with defaults of configuration of the shell
provisioner. provisioner.
- Fix Puppet server using "host_name" instead of "hostname" [GH-1444]
## 1.1.0 (March 14, 2013) ## 1.1.0 (March 14, 2013)

2
plugins/provisioners/puppet/provisioner/puppet_server.rb
View File

@ -29,7 +29,7 @@ module VagrantPlugins
if config.puppet_node if config.puppet_node
# If a node name is given, we use that directly for the certname # If a node name is given, we use that directly for the certname
cn = config.puppet_node cn = config.puppet_node
elsif @machine.config.vm.host_name elsif @machine.config.vm.hostname
# If a host name is given, we explicitly set the certname to # If a host name is given, we explicitly set the certname to
# nil so that the hostname becomes the cert name. # nil so that the hostname becomes the cert name.
cn = nil cn = nil