From 9e80a55d7b2b4007b08822cfbf75da86b9e8afd6 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 17 Mar 2013 22:26:44 -0700 Subject: [PATCH] Puppet server host_name should be hostname [GH-1444] --- CHANGELOG.md | 1 + plugins/provisioners/puppet/provisioner/puppet_server.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a2fa9d2c..42227fd1d 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/plugins/provisioners/puppet/provisioner/puppet_server.rb b/plugins/provisioners/puppet/provisioner/puppet_server.rb index 617332934..53ec81026 100644 --- a/plugins/provisioners/puppet/provisioner/puppet_server.rb +++ b/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