use multipackage syntax to install packages

chef/chef#3570 almost working now.
furlongm · Feb 17, 2016 · ccb5c29 · ccb5c29
1 parent 688e66a
commit ccb5c29
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 12 deletions.
diff --git a/chef/cookbooks/misc/recipes/default.rb b/chef/cookbooks/misc/recipes/default.rb
@@ -1,7 +1,18 @@
-%w{htop tree git strace mlocate diffstat bash-completion pwgen lsof multitail}.each do |pkg|
-  package pkg do
-    action :install
-  end
+misc_packages = [
+  'htop',
+  'tree',
+  'git',
+  'strace',
+  'mlocate',
+  'diffstat',
+  'bash-completion',
+  'pwgen',
+  'lsof',
+  'multitail',
+]
+
+package misc_packages do
+  action :install
 end
 
 case node['platform_family']

diff --git a/chef/cookbooks/net/recipes/default.rb b/chef/cookbooks/net/recipes/default.rb
@@ -1,7 +1,17 @@
-%w{ethtool tcpdump nmap telnet iftop whois wget iperf ipset}.each do |pkg|
-  package pkg do
-    action :install
-  end
+net_packages = [
+  'ethtool',
+  'tcpdump',
+  'nmap',
+  'telnet',
+  'iftop',
+  'whois',
+  'wget',
+  'iperf',
+  'ipset',
+]
+
+package net_packages do
+  action :install
 end
 
 package 'bind-utils' do

diff --git a/chef/cookbooks/vim/recipes/default.rb b/chef/cookbooks/vim/recipes/default.rb
@@ -15,10 +15,7 @@
       action :create
     end
   when 'suse'
-    package 'vim' do
-      action :install
-    end
-    package 'vim-data' do
+    package ['vim', 'vim-data'] do
       action :install
     end
     cookbook_file 'vimrc.Suse' do