Puppet server host_name should be hostname [GH-1444]

CHANGELOG.md

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

plugins/provisioners/puppet/provisioner/puppet_server.rb

@@ -29,7 +29,7 @@ module VagrantPlugins
           if config.puppet_node
             # If a node name is given, we use that directly for the certname
             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
             # nil so that the hostname becomes the cert name.
             cn = nil