Merge pull request #815 from travis-ci/meat-precise-hostname-move

Extract hostname bits to align with trusty

Author: meatballhat

ci_environment/travis_build_environment/recipes/default.rb

@@ -50,52 +50,7 @@
   user "root"
 end
 
-bits     = (node.kernel.machine =~ /x86_64/ ? 64 : 32)
-hostname = case [node[:platform], node[:platform_version]]
-           when ["ubuntu", "11.04"] then
-             "natty#{bits}"
-           when ["ubuntu", "11.10"] then
-             "oneiric#{bits}"
-           when ["ubuntu", "12.04"] then
-             "precise#{bits}"
-           end
-
-template "/etc/hosts" do
-  owner "root"
-  group "root"
-  mode 0644
-  variables(:hostname => hostname)
-  source "etc/hosts.erb"
-  not_if { !node[:travis_build_environment][:update_hosts] }
-end
-
-%w(
-  /etc/cloud/templates/hosts.debian.tmpl
-  /etc/cloud/templates/hosts.tmpl
-  /etc/cloud/templates/hosts.ubuntu.tmpl
-).each do |filename|
-  template filename do
-    source 'etc/cloud/templates/hosts.tmpl.erb'
-    owner 'root'
-    group 'root'
-    mode 0644
-    variables(hostname: hostname)
-  end
-end
-
-template "/etc/hostname" do
-  owner "root"
-  group "root"
-  mode 0644
-  variables(:hostname => hostname)
-  source "etc/hostname.erb"
-  not_if { !node[:travis_build_environment][:update_hosts] }
-end
-
-execute "hostname #{hostname}" do
-  user "root"
-end
-
+include_recipe 'travis_build_environment::hostname'
 
 template "/etc/security/limits.conf" do
   owner "root"

ci_environment/travis_build_environment/recipes/hostname.rb

@@ -0,0 +1,69 @@
+# Cookbook Name:: travis_build_environment
+# Recipe:: hostname
+# Copyright 2011-2015, Travis CI GmbH <[email protected]>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+include_recipe 'travis_build_environment::cloud_init'
+
+bits     = (node.kernel.machine =~ /x86_64/ ? 64 : 32)
+hostname = case [node[:platform], node[:platform_version]]
+           when ["ubuntu", "11.04"] then
+             "natty#{bits}"
+           when ["ubuntu", "11.10"] then
+             "oneiric#{bits}"
+           when ["ubuntu", "12.04"] then
+             "precise#{bits}"
+           end
+
+template "/etc/hosts" do
+  owner "root"
+  group "root"
+  mode 0644
+  variables(:hostname => hostname)
+  source "etc/hosts.erb"
+  not_if { !node[:travis_build_environment][:update_hosts] }
+end
+
+%w(
+  /etc/cloud/templates/hosts.debian.tmpl
+  /etc/cloud/templates/hosts.tmpl
+  /etc/cloud/templates/hosts.ubuntu.tmpl
+).each do |filename|
+  template filename do
+    source 'etc/cloud/templates/hosts.tmpl.erb'
+    owner 'root'
+    group 'root'
+    mode 0644
+    variables(hostname: hostname)
+  end
+end
+
+template "/etc/hostname" do
+  owner "root"
+  group "root"
+  mode 0644
+  variables(:hostname => hostname)
+  source "etc/hostname.erb"
+  not_if { !node[:travis_build_environment][:update_hosts] }
+end
+
+execute "hostname #{hostname}" do
+  user "root"
+end