Merge pull request #2792 from smoyer/redhat_hostname_patch

guests/redhat: use FQDN for hostname

plugins/guests/redhat/cap/change_host_name.rb

@@ -49,7 +49,7 @@ module VagrantPlugins
         end
 
         def update_hostname
-          sudo "hostname #{short_hostname}"
+          sudo "hostname #{fqdn}"
         end
 
         # /etc/hosts should resemble:

test/unit/plugins/guests/support/shared/redhat_like_host_name_examples.rb

@@ -1,9 +1,5 @@
 shared_examples 'a partial redhat-like host name change' do
   shared_examples 'shared between newhostname styles' do
-    it 'updates hostname on the machine with the new short hostname' do
-      communicator.expect_command(%q(hostname newhostname))
-      described_class.change_host_name(machine, new_hostname)
-    end
 
     it 'sets dhcp_hostname with the provided short hostname' do
       communicator.expect_command(%q(sed -i 's/\\(DHCP_HOSTNAME=\\).*/\\1"newhostname"/' /etc/sysconfig/network-scripts/ifcfg-*))
@@ -25,6 +21,11 @@ shared_examples 'a partial redhat-like host name change' do
       communicator.expect_command(%q(sed -i 's/\\(HOSTNAME=\\).*/\\1newhostname.newdomain.tld/' /etc/sysconfig/network))
       described_class.change_host_name(machine, new_hostname)
     end
+
+    it 'updates hostname on the machine with the new hostname' do
+      communicator.expect_command(%q(hostname newhostname.newdomain.tld))
+      described_class.change_host_name(machine, new_hostname)
+    end
   end
 
   context 'when newhostname is simple' do
@@ -36,6 +37,12 @@ shared_examples 'a partial redhat-like host name change' do
       communicator.expect_command(%q(sed -i 's/\\(HOSTNAME=\\).*/\\1newhostname/' /etc/sysconfig/network))
       described_class.change_host_name(machine, new_hostname)
     end
+
+    it 'updates hostname on the machine with the new hostname' do
+      communicator.expect_command(%q(hostname newhostname))
+      described_class.change_host_name(machine, new_hostname)
+    end
+
   end
 end