From 4c1df5edd8ffdc2272a5397e0853d8fc63602708 Mon Sep 17 00:00:00 2001 From: Cookstyle Bot Date: Fri, 18 Jun 2021 16:39:07 -0700 Subject: [PATCH] Cookstyle Bot Auto Corrections with Cookstyle 7.13.0 This change is automatically generated by the Cookstyle Bot using the latest version of Cookstyle (7.13.0). Adopting changes suggested by Cookstyle improves cookbook readability, avoids common coding mistakes, and eases upgrades to newer versions of the Chef Infra Client. Signed-off-by: Cookstyle --- files/default/knife_lxc | 73 +++++++++++++++++------------------ files/default/lxc-precise-lts | 22 +++++------ 2 files changed, 47 insertions(+), 48 deletions(-) diff --git a/files/default/knife_lxc b/files/default/knife_lxc index 5c2f12b..ce3809a 100644 --- a/files/default/knife_lxc +++ b/files/default/knife_lxc @@ -35,7 +35,7 @@ def conf end def lxc_exists?(lxc_name) - current_names = Dir.glob(File.join(LXC_HOME, '*')).map{|c| File.basename(c)} + current_names = Dir.glob(File.join(LXC_HOME, '*')).map { |c| File.basename(c) } current_names.include?(lxc_name) end @@ -46,24 +46,24 @@ end def available_ips # TODO: Add range calculation range = conf['address']['range'] - if(range.to_s.empty?) - range = (range.split('-').first.split('.').last..range.split('-').last).map{|oct| - "#{range.split('-').first.split('.').slice(0,3).join('.')}.#{oct}" - } - else - range = [] - end + range = if range.to_s.empty? + (range.split('-').first.split('.').last..range.split('-').last).map do |oct| + "#{range.split('-').first.split('.').slice(0, 3).join('.')}.#{oct}" + end + else + [] + end (conf['addresses']['static'] + range).compact end def used_ips - Dir.glob(File.join(LXC_HOME, '*')).map{ |ctn| - File.readlines(File.join(ctn, 'rootfs', 'etc', 'network', 'interfaces')).detect{ |line| + Dir.glob(File.join(LXC_HOME, '*')).map do |ctn| + File.readlines(File.join(ctn, 'rootfs', 'etc', 'network', 'interfaces')).detect do |line| line.include?('address') - }.to_s.split(' ').last.to_s.strip - }.reject{ |addr| + end.to_s.split(' ').last.to_s.strip + end.reject do |addr| addr.empty? - } + end end def update_container_ip(name) @@ -78,9 +78,9 @@ def update_network_interfaces(name, address) (parts = address.split('.')).last.replace('1') default_gw = parts.join('.') File.open(File.join(LXC_HOME, name, 'rootfs', 'etc', 'network', 'interfaces'), 'w') do |file| - file.puts "auto lo eth0" - file.puts "iface lo inet loopback" - file.puts "iface eth0 inet static" + file.puts 'auto lo eth0' + file.puts 'iface lo inet loopback' + file.puts 'iface eth0 inet static' file.puts " address #{address}" file.puts " gateway #{conf['gateway'] || default_gw}" file.puts " netmask #{conf['netmask'] || default_nm}" @@ -90,7 +90,7 @@ end def sudoable_ubuntu(name) path = File.join(LXC_HOME, name, 'rootfs', 'etc', 'sudoers') content = File.readlines(path).map do |line| - if(line.start_with?('%sudo')) + if line.start_with?('%sudo') '%sudo ALL=(ALL) NOPASSWD:ALL' else line @@ -102,7 +102,7 @@ def sudoable_ubuntu(name) end def clone_container(name, template) - Lxc::Clone(:original => "#{template}_base", :new_name => name).clone! + Lxc::Clone(original: "#{template}_base", new_name: name).clone! end def start_container(name) @@ -118,7 +118,7 @@ def create_lxc(lxc_name, template) clone_container(lxc_name, template) address = update_container_ip(lxc_name) # TODO: Update debian and fedora to use sudo user and remove root login - if(lxc_name == 'ubuntu') + if lxc_name == 'ubuntu' sudoable_ubuntu(lxc_name) end start_container(lxc_name) @@ -131,11 +131,11 @@ end def lxc_type(name) base = File.join(LXC_HOME, name, 'rootfs', 'etc') - if(File.exists?(lsb = File.join(base, 'lsb-release'))) + if File.exist?(lsb = File.join(base, 'lsb-release')) File.readlines(lsb).last.split('=').last.strip.gsub('"', '') - elsif(File.exists?(sys_rel = File.join(base, 'system-release'))) + elsif File.exist?(sys_rel = File.join(base, 'system-release')) File.readlines(sys_rel).first.strip - elsif(File.exists?(deb_ver = File.join(base, 'debian_version'))) + elsif File.exist?(deb_ver = File.join(base, 'debian_version')) "Debain #{File.read(deb_ver).strip}" else 'UNKNOWN' @@ -144,12 +144,12 @@ end def list_lxcs info = Hash[ - *Dir.glob(File.join(LXC_HOME, '*')).map{|dir| + *Dir.glob(File.join(LXC_HOME, '*')).map do |dir| key = File.basename(dir) - [key, {:address => lxc_address(key), :type => lxc_type(key)}] - }.sort{|a,b| + [key, { address: lxc_address(key), type: lxc_type(key) }] + end.sort do |a, b| a.first <=> b.first - }.flatten + end.flatten ] info.each do |name, info| puts "#{name}" @@ -166,7 +166,7 @@ end def delete_lxc(lxc_name) Lxc.new(lxc_name).stop - %x{lxc-destroy -n #{lxc_name}} + `lxc-destroy -n #{lxc_name}` end action = ARGV.first.to_s @@ -179,44 +179,43 @@ when 'list' list_lxcs when 'info' lxc_name = ARGV[1] - if(lxc_exists?(lxc_name)) + if lxc_exists?(lxc_name) info_lxc(lxc_name) else - $stderr.puts "Requested container does not exist: #{lxc_name}" + warn "Requested container does not exist: #{lxc_name}" exit 2 end when 'start' lxc_name = ARGV[1] - if(lxc_exists?(lxc_name)) + if lxc_exists?(lxc_name) print "Starting container #{lxc_name}... " start_lxc(lxc_name) puts 'started' else - $stderr.puts "Requested container does not exist: #{lxc_name}" + warn "Requested container does not exist: #{lxc_name}" exit 2 end when 'stop' lxc_name = ARGV[1] - if(lxc_exists?(lxc_name)) + if lxc_exists?(lxc_name) print "Stopping container #{lxc_name}... " stop_lxc(lxc_name) puts 'stopped' else - $stderr.puts "Requested container does not exist: #{lxc_name}" + warn "Requested container does not exist: #{lxc_name}" exit 2 end when 'delete' lxc_name = ARGV[1] - if(lxc_exists?(lxc_name)) + if lxc_exists?(lxc_name) print "Deleting LXC #{lxc_name}... " destroy_lxc(lxc_name) puts 'done' else - $stderr.puts "Requested container does not exist: #{lxc_name}" + warn "Requested container does not exist: #{lxc_name}" exit 2 end else - $stderr.puts "ERROR: Unknown action: #{action}" + warn "ERROR: Unknown action: #{action}" exit 1 end - diff --git a/files/default/lxc-precise-lts b/files/default/lxc-precise-lts index 4d51e0d..034d970 100644 --- a/files/default/lxc-precise-lts +++ b/files/default/lxc-precise-lts @@ -4,12 +4,12 @@ require 'fileutils' -LXC_TEMPLATE='/usr/lib/lxc/templates/lxc-ubuntu' +LXC_TEMPLATE = '/usr/lib/lxc/templates/lxc-ubuntu' def report(action) print "#{action}... " yield - puts "done" + puts 'done' end # Set paths @@ -28,14 +28,14 @@ end # define required packages report 'Fetching required package list' do - packages = %x{debootstrap --print-debs --include="vim,ssh" precise /tmp/precise-bootstrap}.strip + packages = `debootstrap --print-debs --include="vim,ssh" precise /tmp/precise-bootstrap`.strip end # download packages report 'Downloading packages' do Dir.chdir(pool) - unless(system("apt-get download #{packages}")) - $stderr.puts 'Package download failed!' + unless system("apt-get download #{packages}") + warn 'Package download failed!' exit 1 end end @@ -65,8 +65,8 @@ end # generate report 'Generating archive' do Dir.chdir(repo_root) - unless(system("apt-ftparchive generate #{File.basename(conf)}")) - $stderr.puts 'Archive generation failed!' + unless system("apt-ftparchive generate #{File.basename(conf)}") + warn 'Archive generation failed!' exit 1 end end @@ -74,18 +74,18 @@ end report 'Adding release files' do [precise_root, component].each do |d| Dir.chdir(d) - con = %x{apt-ftparchive release .} + con = `apt-ftparchive release .` File.open(File.join(d, 'Release'), 'w') do |file| file.puts "Components main\n#{con}\n" end end end -if(File.exists?(LXC_TEMPLATE)) +if File.exist?(LXC_TEMPLATE) report 'Updating ubuntu lxc template' do contents = File.readlines(LXC_TEMPLATE) contents.map! do |line| - if(line =~ /^\s*debootstrap.+\$MIRROR\s*$/) + if line =~ /^\s*debootstrap.+\$MIRROR\s*$/ 'debootstrap --no-check-gpg --verbose --components=main --arch=$arch --include=$packages $release $cache/partial-$arch $LOCAL_REPO' else line @@ -99,6 +99,6 @@ end puts "\nSUCCESS: Local updated precise repository created for debootstrap" puts " USAGE: debootstrap precise store_dir file://#{precise_root}" -if(File.exists?(LXC_TEMPLATE)) +if File.exist?(LXC_TEMPLATE) puts "LXC USAGE: LOCAL_REPO=\"file://#{precise_root}\" lxc-create -n ctn-name -t ubuntu" end