packer-config 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01133b9d2fb0e22d4412694baed496349e7abfbd
-  data.tar.gz: c22b355228f0a5a40deb29caa81d1ee76d68ff25
+  metadata.gz: f853df0259e71190114be57ce09149fefc507e0b
+  data.tar.gz: 2951764a66b04437211c990a05698b6bcf5da3b5
 SHA512:
-  metadata.gz: b955805634e3dc46e646193b12c521524d5971fc29bff2c97657381954ac0bf212f466e5212cef87f2586abdd44e9c8b4e5f3baedb42d28aecce625e9d2e8136
-  data.tar.gz: e6e8fea9c9c111b06573713d556e8965410a4816731ed3c9a803959f809df97ca5ceeb873a00a9342e0143f35baf8bcff39ae635be0fbc33fa9be00aeee0e7f2
+  metadata.gz: ca00142e7263ca83347baa0a8580920ebc5936fc4536b86e8dd5c9a569d84b32814eb583055faba62c41957e5f47ffdf1789b236f317a2dc1a308675fa223732
+  data.tar.gz: c092c380ef0409401fb3717e3e3eb73c78b62421b7c1fb2d8202c0e8327e3c8489ddd470f42414403a8634089dcc8dcae25e704658a232fcf5bd5e2725be9f76

data/.gitignore

@@ -7,7 +7,7 @@
 /pkg/
 /spec/reports/
 /spec/integration/*.json
-spec/integration/centos-6.*-x86_64-virtualbox
+/spec/integration/centos-*-x86_64-virtualbox
 /test/tmp/
 /test/version_tmp/
 /tmp/

data/.rubocop.yml

@@ -1,3 +1,4 @@
+require: rubocop-performance
 inherit_from: .rubocop_todo.yml
 
 Documentation:
@@ -119,6 +120,9 @@ Layout/EmptyLines:
 Layout/EmptyLinesAroundAccessModifier:
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 Style/GuardClause:
   Enabled: false
 
@@ -146,9 +150,6 @@ Style/MultilineIfThen:
 Style/MultilineTernaryOperator:
   Enabled: false
 
-Style/MultilineTernaryOperator:
-  Enabled: false
-
 Style/NilComparison:
   Enabled: false
 
@@ -194,7 +195,7 @@ Style/WhileUntilDo:
 Style/WhileUntilModifier:
   Enabled: false
 
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
   Enabled: false
 
 # As of rubocop 0.21, it thinks kwargs are useless assignments

data/.travis.yml

@@ -1,8 +1,5 @@
 language: ruby
 rvm:
-- 2.1
-- 2.2
-- 2.3
 - 2.4
 - 2.5
 - 2.6

data/COPYRIGHT

@@ -9,6 +9,7 @@ Including, but not limited to:
   Enzo Rivello
   Edwin Biemond
   Andrei Shiniti Nakagawa
+  Kevin Formsma
 
 For licensing information please see LICENSE. Copyright holders contributing to
 this project agree to have their contributions licensed under the terms of the

data/Gemfile

@@ -1,13 +1,14 @@
 source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'bundler', '~> 1.11'
-  gem 'fakefs', '~> 0.7'
-  gem 'rake', '~> 10.5'
-  gem 'rspec', '~> 3.4'
-  gem 'rspec-mocks', '~> 3.4'
-  gem 'rubocop', '~> 0.49'
-  gem 'rubygems-tasks', '~> 0.2'
+  gem 'bundler'
+  gem 'fakefs'
+  gem 'rake'
+  gem 'rspec'
+  gem 'rspec-mocks'
+  gem 'rubocop'
+  gem 'rubocop-performance'
+  gem 'rubygems-tasks'
 end
 
 gemspec

data/README.md

@@ -25,7 +25,7 @@ Bonus: you can really go to town with templates when it's all done in Ruby.
 
 ## Requires
 
-* [Packer](http://packer.io) version 0.8.5 or higher
+* [Packer](http://packer.io) version 1.0.0 or higher
 
 ### Builders
 
@@ -67,6 +67,7 @@ The following [Packer post-processors](http://www.packer.io/docs/templates/post-
 * [docker-tag](http://www.packer.io/docs/post-processors/docker-tag.html)
 * [vagrant](http://www.packer.io/docs/post-processors/vagrant.html)
 * [compress](https://www.packer.io/docs/post-processors/compress.html)
+* [manifest](https://www.packer.io/docs/post-processors/manifest.html)
 
 ## Examples
 
@@ -74,11 +75,12 @@ The following [Packer post-processors](http://www.packer.io/docs/templates/post-
 
 This example is based on the integration test [spec/integration/centos_vagrant_spec.rb](spec/integration/centos_vagrant_spec.rb). It produces a Vagrant Basebox that's provisionable with [Chef](http://www.getchef.com/) and the packer config and provisioning is based on work done in the [Bento](https://github.com/opscode/bento) project from the OpsCode crew.
 
-    CENTOS_VERSION = '6.8'
+    CENTOS_VERSION = '7'
 
     pconfig = Packer::Config.new "centos-#{CENTOS_VERSION}-vagrant.json"
     pconfig.description "CentOS #{CENTOS_VERSION} VirtualBox Vagrant"
-    pconfig.add_variable 'mirror', 'http://mirrors.sonic.net/centos/'
+    pconfig.add_variable 'mirror', 'http://mirrors.sonic.net/centos'
+    pconfig.add_variable 'mirror', 'http://ftp.pbone.net/pub/centos'
     pconfig.add_variable 'my_version', '0.0.1'
     pconfig.add_variable 'chef_version', 'latest'
 
@@ -89,9 +91,9 @@ This example is based on the integration test [spec/integration/centos_vagrant_s
     builder.guest_additions_path "VBoxGuestAdditions_#{pconfig.macro.Version}.iso"
     builder.guest_os_type "RedHat_64"
     builder.http_directory "scripts/kickstart"
-    builder.iso_checksum 'afab3a588cda94cd768826e77ad4db2b5ee7c485'
-    builder.iso_checksum_type 'sha1'
-    builder.iso_url "#{pconfig.variable 'mirror'}/6/isos/x86_64/CentOS-#{CENTOS_VERSION}-x86_64-bin-DVD1.iso"
+    builder.iso_checksum '38d5d51d9d100fd73df031ffd6bd8b1297ce24660dc8c13a3b8b4534a4bd291c'
+    builder.iso_checksum_type 'sha256'
+    builder.iso_url "#{pconfig.variable 'mirror'}/#{CENTOS_VERSION}/isos/x86_64/CentOS-7-x86_64-Minimal-1810.iso"
     builder.output_directory "centos-#{CENTOS_VERSION}-x86_64-virtualbox"
     builder.shutdown_command "echo 'vagrant'|sudo -S /sbin/halt -h -p"
     builder.communicator "ssh"
@@ -122,13 +124,8 @@ This example is based on the integration test [spec/integration/centos_vagrant_s
 
     provisioner = pconfig.add_provisioner Packer::Provisioner::SHELL
     provisioner.scripts [
-      'scripts/fix-slow-dns.sh',
       'scripts/sshd.sh',
-      'scripts/vagrant.sh',
-      'scripts/vmtools.sh',
-      'scripts/chef.sh',
-      'scripts/cleanup.sh',
-      'scripts/minimize.sh'
+      'scripts/vagrant.sh'
     ]
     provisioner.environment_vars [
       "CHEF_VERSION=#{pconfig.variable 'chef_version'}",
@@ -160,4 +157,4 @@ Please see [TODO.md](TODO.md) for the short list of big things I thought worth w
 
 ## Contact Me
 
-Questions or comments about `packer-config`? Hit me up at ian.chesal@gmail.com or ianc@squareup.com.
+Questions or comments about `packer-config`? Hit me up at ian.chesal@gmail.com.

data/RELEASENOTES.md

@@ -1,5 +1,13 @@
 # packer-config Release Notes
 
+## 1.6.4
+
+* Add support for the manifest post-provisioner (via [arothian])
+* Fix broken test and development environments
+* Fix broken integration test, update to CentOS 7
+* Minimum Ruby version updated to 2.4.0
+* Minimum Packer version updated to 1.0.0
+
 ## 1.6.3
 
 * Add support for the shell-local provisioner (via [shinitiandrei])
@@ -70,3 +78,4 @@
   [enzor]: https://github.com/enzor
   [biemond]: https://github.com/biemond
   [shinitiandrei]: https://github.com/shinitiandrei
+  [arothian]: https://github.com/arothian

data/lib/packer-config.rb

@@ -21,7 +21,7 @@ module Packer
     attr_reader   :envvar
     attr_reader   :output_file
 
-    PACKER_VERSION = '0.9.0'
+    PACKER_VERSION = '1.0.0'
 
     def initialize(file)
       super()
@@ -42,6 +42,7 @@ module Packer
       if self.builders.empty?
         raise DataValidationError.new("At least one builder is required")
       end
+
       self.builders.each(&:validate)
       self.provisioners.each(&:validate)
       self.postprocessors.each(&:validate)
@@ -156,6 +157,7 @@ module Packer
       unless self.variables.key? name
         raise UndefinedVariableError.new("No variable named #{name} has been defined -- did you forget to call add_variable?")
       end
+
       "{{user `#{name}`}}"
     end
 

data/lib/packer/builder.rb

@@ -30,6 +30,7 @@ module Packer
       unless validate_type(type)
         raise UnrecognizedBuilderTypeError.new("Unrecognized builder type #{type}")
       end
+
       {
         AMAZON_EBS      => Packer::Builder::Amazon::EBS,
         AMAZON_INSTANCE => Packer::Builder::Amazon::Instance,
@@ -63,6 +64,7 @@ module Packer
     # See: https://packer.io/docs/templates/communicator.html
     def communicator(comm)
       raise(DataValidationError, "unknown communicator protocol #{comm}") unless communicators.include? comm
+
       self.__add_string('communicator', comm)
     end
 

data/lib/packer/dataobject.rb

@@ -75,15 +75,18 @@ module Packer
     def __add_array_of_strings(key, values, exclusives = [])
       self.__exclusive_key_error(key, exclusives)
       raise TypeError.new() unless Array.try_convert(values)
+
       self.data[key.to_s] = values.to_ary.map(&:to_s)
     end
 
     def __add_array_of_array_of_strings(key, values, exclusives = [])
       self.__exclusive_key_error(key, exclusives)
       raise TypeError.new() unless Array.try_convert(values)
+
       self.data[key.to_s] = []
       values.each do |v|
         raise TypeError.new() unless Array.try_convert(v)
+
         self.data[key.to_s].push(v.to_ary.map(&:to_s))
       end
     end
@@ -91,9 +94,11 @@ module Packer
     def __add_array_of_hashes(key, values, exclusives = [])
       self.__exclusive_key_error(key, exclusives)
       raise TypeError.new() unless Array.try_convert(values)
+
       self.data[key.to_s] = []
       values.each do |v|
         raise TypeError.new() unless v.is_a?(Hash)
+
         self.data[key.to_s].push({})
         v.keys.each do |k|
           self.data[key.to_s][-1][k] = v[k].to_s
@@ -104,6 +109,7 @@ module Packer
     def __add_array_of_ints(key, values, exclusives = [])
       self.__exclusive_key_error(key, exclusives)
       raise TypeError.new() unless Array.try_convert(values)
+
       self.data[key.to_s] = values.to_ary.map(&:to_i)
     end
 
@@ -126,6 +132,7 @@ module Packer
     def __add_hash(key, data, exclusives = [])
       self.__exclusive_key_error(key, exclusives)
       raise TypeError.new() unless data.is_a?(Hash)
+
       self.data[key.to_s] = {}
       data.keys.each do |k|
         self.data[key.to_s][k] = data[k].to_s
@@ -136,6 +143,7 @@ module Packer
     def __add_json(key, data, exclusives = [])
       self.__exclusive_key_error(key, exclusives)
       raise TypeError.new() unless data.is_a?(Hash)
+
       self.data[key.to_s] = {}
       data.keys.each do |k|
         self.data[key.to_s][k] = data[k]

data/lib/packer/postprocessor.rb

@@ -11,6 +11,7 @@ module Packer
     VAGRANT = 'vagrant'
     COMPRESS = 'compress'
     SHELL_LOCAL = 'shell-local'
+    MANIFEST = 'manifest'
 
     VALID_POST_PROCESSOR_TYPES = [
       DOCKER_IMPORT,
@@ -19,7 +20,8 @@ module Packer
       DOCKER_TAG,
       COMPRESS,
       VAGRANT,
-      SHELL_LOCAL
+      SHELL_LOCAL,
+      MANIFEST
     ]
 
     class UnrecognizedPostProcessorTypeError < StandardError
@@ -29,6 +31,7 @@ module Packer
       unless validate_type(type)
         raise UnrecognizedPostProcessorTypeError.new("Unrecognized post-processor type #{type}")
       end
+
       {
         DOCKER_IMPORT => Packer::PostProcessor::DockerImport,
         DOCKER_PUSH   => Packer::PostProcessor::DockerPush,
@@ -36,7 +39,8 @@ module Packer
         DOCKER_TAG    => Packer::PostProcessor::DockerTag,
         COMPRESS      => Packer::PostProcessor::Compress,
         SHELL_LOCAL   => Packer::PostProcessor::ShellLocal,
-        VAGRANT       => Packer::PostProcessor::Vagrant
+        VAGRANT       => Packer::PostProcessor::Vagrant,
+        MANIFEST      => Packer::PostProcessor::Manifest
       }.fetch(type).new
     end
 

data/lib/packer/postprocessors/all.rb

@@ -3,3 +3,4 @@ require_relative 'docker'
 require_relative 'vagrant'
 require_relative 'compress'
 require_relative 'shell-local'
+require_relative 'manifest'

data/lib/packer/postprocessors/manifest.rb

@@ -0,0 +1,26 @@
+# Encoding: utf-8
+require 'packer/postprocessor'
+require 'packer/dataobject'
+
+module Packer
+  class PostProcessor < Packer::DataObject
+    class Manifest < PostProcessor
+      def initialize
+        super
+        self.data['type'] = MANIFEST
+      end
+
+      def output(file)
+        self.__add_string('output', file)
+      end
+
+      def strip_path(bool)
+        self.__add_boolean('strip_path', bool)
+      end
+
+      def custom_data(data)
+        self.__add_hash('custom_data', data)
+      end
+    end
+  end
+end

data/lib/packer/postprocessors/shell-local.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Naming/FileName
 # Encoding: utf-8
 require 'packer/postprocessor'
 require 'packer/dataobject'
@@ -44,3 +45,5 @@ module Packer
     end
   end
 end
+
+# rubocop:enable Naming/FileName

data/lib/packer/provisioner.rb

@@ -37,6 +37,7 @@ module Packer
       unless validate_type(type)
         raise UnrecognizedProvisionerTypeError.new("Unrecognized provisioner type #{type}")
       end
+
       {
         SHELL             => Packer::Provisioner::Shell,
         WINDOWS_SHELL     => Packer::Provisioner::WindowsShell,
@@ -81,6 +82,7 @@ module Packer
 
     def override(builddefinition, values)
       raise TypeError.new() unless values.is_a?(Hash)
+
       unless self.data.key? 'override'
         self.data['override'] = {}
       end

data/lib/packer/runner.rb

@@ -44,6 +44,7 @@ module Packer
       end
       # rubocop:disable Style/NumericPredicate
       raise CommandExecutionError.new(stderr) unless status == 0
+
       stdout
       # rubocop:enable Style/NumericPredicate
     end

data/lib/packer/version.rb

@@ -1,3 +1,3 @@
 module Packer
-  VERSION = '1.6.3'.freeze
+  VERSION = '1.6.4'.freeze
 end

data/packer-config.gemspec

@@ -6,7 +6,7 @@ require 'packer/version'
 Gem::Specification.new do |spec|
   spec.name          = 'packer-config'
   spec.version       = Packer::VERSION
-  spec.authors       = ["Ian Chesal", "Fraser Cobb", "Greg Poirier", "Matasano Security", "Greg Diamond", "Enzo Rivello", "Edwin Biemond", "Andrei Shiniti Nakagawa"]
+  spec.authors       = ["Ian Chesal", "Fraser Cobb", "Greg Poirier", "Matasano Security", "Greg Diamond", "Enzo Rivello", "Edwin Biemond", "Andrei Shiniti Nakagawa", "Kevin Formsma"]
   spec.email         = %w(ian.chesal@gmail.com)
   spec.summary       = 'An object model to build packer.io configurations in Ruby.'
   spec.description   = <<-END
@@ -19,7 +19,7 @@ syntax for referencing variables and whatnot in the JSON.
 END
   spec.homepage      = 'https://github.com/ianchesal/packer-config'
   spec.license       = 'Apache-2.0'
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.4.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/spec/integration/centos_vagrant_spec.rb

@@ -2,12 +2,13 @@
 require 'spec_helper'
 
 RSpec.describe Packer::Config do
-  it 'can build a centos-6.10 Vagrant base box' do
-    CENTOS_VERSION = '6.10'
+  it 'can build a centos-7 Vagrant base box' do
+    CENTOS_VERSION = '7'
 
     pconfig = Packer::Config.new "centos-#{CENTOS_VERSION}-vagrant.json"
     pconfig.description "CentOS #{CENTOS_VERSION} VirtualBox Vagrant"
-    pconfig.add_variable 'mirror', 'http://mirrors.sonic.net/centos/'
+    pconfig.add_variable 'mirror', 'http://mirrors.sonic.net/centos'
+    pconfig.add_variable 'mirror', 'http://ftp.pbone.net/pub/centos'
     pconfig.add_variable 'my_version', '0.0.1'
     pconfig.add_variable 'chef_version', 'latest'
 
@@ -18,9 +19,9 @@ RSpec.describe Packer::Config do
     builder.guest_additions_path "VBoxGuestAdditions_#{pconfig.macro.Version}.iso"
     builder.guest_os_type "RedHat_64"
     builder.http_directory "scripts/kickstart"
-    builder.iso_checksum '48908ca17bc4ba2fb8e365c9fe7648eb6cd6bd67'
-    builder.iso_checksum_type 'sha1'
-    builder.iso_url "#{pconfig.variable 'mirror'}/6/isos/x86_64/CentOS-#{CENTOS_VERSION}-x86_64-bin-DVD1.iso"
+    builder.iso_checksum '38d5d51d9d100fd73df031ffd6bd8b1297ce24660dc8c13a3b8b4534a4bd291c'
+    builder.iso_checksum_type 'sha256'
+    builder.iso_url "#{pconfig.variable 'mirror'}/#{CENTOS_VERSION}/isos/x86_64/CentOS-7-x86_64-Minimal-1810.iso"
     builder.output_directory "centos-#{CENTOS_VERSION}-x86_64-virtualbox"
     builder.shutdown_command "echo 'vagrant'|sudo -S /sbin/halt -h -p"
     builder.communicator "ssh"
@@ -51,13 +52,8 @@ RSpec.describe Packer::Config do
 
     provisioner = pconfig.add_provisioner Packer::Provisioner::SHELL
     provisioner.scripts [
-      'scripts/fix-slow-dns.sh',
       'scripts/sshd.sh',
-      'scripts/vagrant.sh',
-      'scripts/vmtools.sh',
-      'scripts/chef.sh',
-      'scripts/cleanup.sh',
-      'scripts/minimize.sh'
+      'scripts/vagrant.sh'
     ]
     provisioner.environment_vars [
       "CHEF_VERSION=#{pconfig.variable 'chef_version'}",

data/spec/integration/scripts/kickstart/centos-7-ks.cfg

@@ -0,0 +1,98 @@
+install
+cdrom
+lang en_US.UTF-8
+keyboard us
+network --bootproto=dhcp --onboot=on --device=eth0
+rootpw vagrant
+firewall --disabled
+selinux --permissive
+timezone UTC
+unsupported_hardware
+bootloader --location=mbr --append="net.ifnames=0 biosdevname=0"
+text
+skipx
+zerombr
+clearpart --all --initlabel
+autopart
+auth --enableshadow --passalgo=sha512 --kickstart
+firstboot --disabled
+reboot --eject
+user --name=vagrant --plaintext --password vagrant
+
+%packages --nobase --ignoremissing --excludedocs --instLangs=en_US.utf8
+# vagrant needs this to copy initial files via scp
+openssh-clients
+sudo
+kernel-headers
+kernel-devel
+gcc
+make
+perl
+selinux-policy-devel
+wget
+nfs-utils
+net-tools
+bzip2
+deltarpm
+-fprintd-pam
+-intltool
+
+# unnecessary firmware
+-aic94xx-firmware
+-alsa-firmware
+-alsa-tools-firmware
+-ivtv-firmware
+-iwl100-firmware
+-iwl105-firmware
+-iwl135-firmware
+-iwl1000-firmware
+-iwl2000-firmware
+-iwl2030-firmware
+-iwl3160-firmware
+-iwl3945-firmware
+-iwl4965-firmware
+-iwl5000-firmware
+-iwl5150-firmware
+-iwl6000-firmware
+-iwl6000g2a-firmware
+-iwl6000g2b-firmware
+-iwl6050-firmware
+-iwl7260-firmware
+-iwl7265-firmware
+%end
+
+%post
+# sudo
+echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant
+chmod 0440 /etc/sudoers.d/vagrant
+
+#Enable hyper-v daemons only if using hyper-v virtualization
+if [ $(virt-what) == "hyperv" ]; then
+    yum -y install hyperv-daemons cifs-utils
+    systemctl enable hypervvssd
+    systemctl enable hypervkvpd
+fi
+
+# Since we disable consistent network naming, we need to make sure the eth0
+# configuration file is in place so it will come up.
+# Delete other network configuration first because RHEL/C7 networking will not
+# restart successfully if there are configuration files for devices that do not
+# exist.
+rm -f /etc/sysconfig/network-scripts/ifcfg-e*
+cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF_
+TYPE=Ethernet
+PROXY_METHOD=none
+BROWSER_ONLY=no
+BOOTPROTO=dhcp
+DEFROUTE=yes
+IPV4_FAILURE_FATAL=no
+IPV6INIT=yes
+IPV6_AUTOCONF=yes
+IPV6_DEFROUTE=yes
+IPV6_FAILURE_FATAL=no
+IPV6_ADDR_GEN_MODE=stable-privacy
+NAME=eth0
+DEVICE=eth0
+ONBOOT=yes
+_EOF_
+%end

data/spec/integration/scripts/minimize.sh

@@ -2,8 +2,37 @@
 
 # From: https://github.com/opscode/bento
 
-dd if=/dev/zero of=/EMPTY bs=1M
-rm -f /EMPTY
-# Block until the empty file has been removed, otherwise, Packer
-# will try to kill the box while the disk is still full and that's bad
-sync
+case "$PACKER_BUILDER_TYPE" in
+  qemu) exit 0 ;;
+esac
+
+# Whiteout root
+count=$(df --sync -kP / | tail -n1  | awk -F ' ' '{print $4}')
+count=$(($count-1))
+dd if=/dev/zero of=/tmp/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed";
+rm /tmp/whitespace
+
+# Whiteout /boot
+count=$(df --sync -kP /boot | tail -n1 | awk -F ' ' '{print $4}')
+count=$(($count-1))
+dd if=/dev/zero of=/boot/whitespace bs=1M count=$count || echo "dd exit code $? is suppressed";
+rm /boot/whitespace
+
+set +e
+swapuuid="`/sbin/blkid -o value -l -s UUID -t TYPE=swap`";
+case "$?" in
+    2|0) ;;
+    *) exit 1 ;;
+esac
+set -e
+
+if [ "x${swapuuid}" != "x" ]; then
+    # Whiteout the swap partition to reduce box size
+    # Swap is disabled till reboot
+    swappart="`readlink -f /dev/disk/by-uuid/$swapuuid`";
+    /sbin/swapoff "$swappart";
+    dd if=/dev/zero of="$swappart" bs=1M || echo "dd exit code $? is suppressed";
+    /sbin/mkswap -U "$swapuuid" "$swappart";
+fi
+
+sync;

data/spec/integration/scripts/sshd.sh

@@ -2,5 +2,21 @@
 
 # From: https://github.com/opscode/bento
 
-echo "UseDNS no" >> /etc/ssh/sshd_config
-echo "GSSAPIAuthentication no" >> /etc/ssh/sshd_config
+SSHD_CONFIG="/etc/ssh/sshd_config"
+
+# ensure that there is a trailing newline before attempting to concatenate
+sed -i -e '$a\' "$SSHD_CONFIG"
+
+USEDNS="UseDNS no"
+if grep -q -E "^[[:space:]]*UseDNS" "$SSHD_CONFIG"; then
+    sed -i "s/^\s*UseDNS.*/${USEDNS}/" "$SSHD_CONFIG"
+else
+    echo "$USEDNS" >>"$SSHD_CONFIG"
+fi
+
+GSSAPI="GSSAPIAuthentication no"
+if grep -q -E "^[[:space:]]*GSSAPIAuthentication" "$SSHD_CONFIG"; then
+    sed -i "s/^\s*GSSAPIAuthentication.*/${GSSAPI}/" "$SSHD_CONFIG"
+else
+    echo "$GSSAPI" >>"$SSHD_CONFIG"
+fi

data/spec/integration/scripts/vagrant.sh

@@ -2,9 +2,20 @@
 
 # From: https://github.com/opscode/bento
 
-mkdir /home/vagrant/.ssh
-wget --no-check-certificate \
-    'https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub' \
-    -O /home/vagrant/.ssh/authorized_keys
-chown -R vagrant /home/vagrant/.ssh
-chmod -R go-rwsx /home/vagrant/.ssh
+# set a default HOME_DIR environment variable if not set
+HOME_DIR="${HOME_DIR:-/home/vagrant}";
+
+pubkey_url="https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub";
+mkdir -p $HOME_DIR/.ssh;
+if command -v wget >/dev/null 2>&1; then
+    wget --no-check-certificate "$pubkey_url" -O $HOME_DIR/.ssh/authorized_keys;
+elif command -v curl >/dev/null 2>&1; then
+    curl --insecure --location "$pubkey_url" > $HOME_DIR/.ssh/authorized_keys;
+elif command -v fetch >/dev/null 2>&1; then
+    fetch -am -o $HOME_DIR/.ssh/authorized_keys "$pubkey_url";
+else
+    echo "Cannot download vagrant public key";
+    exit 1;
+fi
+chown -R vagrant $HOME_DIR/.ssh;
+chmod -R go-rwsx $HOME_DIR/.ssh;

data/spec/integration/scripts/vmtools.sh

@@ -2,38 +2,20 @@
 
 # From: https://github.com/opscode/bento
 
-case "$PACKER_BUILDER_TYPE" in
+# set a default HOME_DIR environment variable if not set
+HOME_DIR="${HOME_DIR:-/home/vagrant}";
 
+case "$PACKER_BUILDER_TYPE" in
 virtualbox-iso|virtualbox-ovf)
-    mkdir /tmp/vbox
-    VER=$(cat /home/vagrant/.vbox_version)
-    if [ ! -f "/home/vagrant/VBoxGuestAdditions_$VER.iso" ]; then
-        wget "http://download.virtualbox.org/virtualbox/4.3.8/VBoxGuestAdditions_$VER.iso" --output-file="/home/vagrant/VBoxGuestAdditions_$VER.iso"
-    fi
-    mount -o loop /home/vagrant/VBoxGuestAdditions_$VER.iso /tmp/vbox
-    sh /tmp/vbox/VBoxLinuxAdditions.run
-    umount /tmp/vbox
-    rmdir /tmp/vbox
-    rm /home/vagrant/*.iso
-    chkconfig --add /etc/init.d/vboxadd
-    chkconfig --level 345 vboxadd on
-    ;;
-
-vmware-iso|vmware-ovf)
-    mkdir /tmp/vmfusion
-    mkdir /tmp/vmfusion-archive
-    mount -o loop /home/vagrant/linux.iso /tmp/vmfusion
-    tar xzf /tmp/vmfusion/VMwareTools-*.tar.gz -C /tmp/vmfusion-archive
-    /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default
-    umount /tmp/vmfusion
-    rm -rf  /tmp/vmfusion
-    rm -rf  /tmp/vmfusion-archive
-    rm /home/vagrant/*.iso
+    VER="`cat $HOME_DIR/.vbox_version`";
+    ISO="VBoxGuestAdditions_$VER.iso";
+    mkdir -p /tmp/vbox;
+    mount -o loop $HOME_DIR/$ISO /tmp/vbox;
+    sh /tmp/vbox/VBoxLinuxAdditions.run \
+        || echo "VBoxLinuxAdditions.run exited $? and is suppressed." \
+            "For more read https://www.virtualbox.org/ticket/12479";
+    umount /tmp/vbox;
+    rm -rf /tmp/vbox;
+    rm -f $HOME_DIR/*.iso;
     ;;
-
-*)
-    echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected."
-    echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-ovf."
-    ;;
-
 esac

data/spec/packer/postprocessors/manifest_spec.rb

@@ -0,0 +1,65 @@
+# Encoding: utf-8
+require 'spec_helper'
+
+RSpec.describe Packer::PostProcessor::Manifest do
+  let(:postprocessor) do
+    Packer::PostProcessor.get_postprocessor(Packer::PostProcessor::MANIFEST)
+  end
+
+  let(:some_string) do
+    'some string'
+  end
+
+  let(:some_array_of_ints) do
+    [1, 2, 3]
+  end
+
+  let(:hash_of_strings) do
+    {
+      my_custom_data: 'example',
+      my_other_data: 'hidden'
+    }
+  end
+
+  describe '#initialize' do
+    it 'has a type of manifest' do
+      expect(postprocessor.data['type']).to eq(Packer::PostProcessor::MANIFEST)
+    end
+  end
+
+  describe '#output' do
+    it 'accepts a string' do
+      postprocessor.output(some_string)
+      expect(postprocessor.data['output']).to eq(some_string)
+      postprocessor.data.delete('output')
+    end
+
+    it 'converts any argument passed to a string' do
+      postprocessor.output(some_array_of_ints)
+      expect(postprocessor.data['output']).to eq(some_array_of_ints.to_s)
+      postprocessor.data.delete('output')
+    end
+  end
+
+  describe '#strip_path' do
+    it 'accepts any truthy value and converts it to true' do
+      postprocessor.strip_path('this is true')
+      expect(postprocessor.data['strip_path']).to be_truthy
+      postprocessor.data.delete('strip_path')
+    end
+
+    it 'accepts any non-truthy value and converts it to false' do
+      postprocessor.strip_path(false)
+      expect(postprocessor.data['strip_path']).to be_falsey
+      postprocessor.data.delete('strip_path')
+    end
+  end
+
+  describe '#custom_data' do
+    it 'adds a hash of strings to the key' do
+      postprocessor.custom_data(hash_of_strings)
+      expect(postprocessor.data['custom_data']).to eq(hash_of_strings)
+      postprocessor.data.delete('custom_data')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: packer-config
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Ian Chesal
@@ -12,10 +12,11 @@ authors:
 - Enzo Rivello
 - Edwin Biemond
 - Andrei Shiniti Nakagawa
+- Kevin Formsma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-04 00:00:00.000000000 Z
+date: 2019-05-04 00:00:00.000000000 Z
 dependencies: []
 description: |
   Building the Packer JSON configurations in raw JSON can be quite an adventure.
@@ -59,6 +60,7 @@ files:
 - lib/packer/postprocessors/all.rb
 - lib/packer/postprocessors/compress.rb
 - lib/packer/postprocessors/docker.rb
+- lib/packer/postprocessors/manifest.rb
 - lib/packer/postprocessors/shell-local.rb
 - lib/packer/postprocessors/vagrant.rb
 - lib/packer/provisioner.rb
@@ -85,7 +87,7 @@ files:
 - spec/integration/scripts/cleanup.sh
 - spec/integration/scripts/fix-slow-dns.sh
 - spec/integration/scripts/hello.sh
-- spec/integration/scripts/kickstart/centos-6.10-ks.cfg
+- spec/integration/scripts/kickstart/centos-7-ks.cfg
 - spec/integration/scripts/minimize.sh
 - spec/integration/scripts/sshd.sh
 - spec/integration/scripts/vagrant.sh
@@ -106,6 +108,7 @@ files:
 - spec/packer/postprocessors/docker_push_spec.rb
 - spec/packer/postprocessors/docker_save_spec.rb
 - spec/packer/postprocessors/docker_tag_spec.rb
+- spec/packer/postprocessors/manifest_spec.rb
 - spec/packer/postprocessors/shell_local_spec.rb
 - spec/packer/postprocessors/vagrant_spec.rb
 - spec/packer/provisioner_spec.rb
@@ -140,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -148,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: An object model to build packer.io configurations in Ruby.
@@ -161,7 +164,7 @@ test_files:
 - spec/integration/scripts/cleanup.sh
 - spec/integration/scripts/fix-slow-dns.sh
 - spec/integration/scripts/hello.sh
-- spec/integration/scripts/kickstart/centos-6.10-ks.cfg
+- spec/integration/scripts/kickstart/centos-7-ks.cfg
 - spec/integration/scripts/minimize.sh
 - spec/integration/scripts/sshd.sh
 - spec/integration/scripts/vagrant.sh
@@ -182,6 +185,7 @@ test_files:
 - spec/packer/postprocessors/docker_push_spec.rb
 - spec/packer/postprocessors/docker_save_spec.rb
 - spec/packer/postprocessors/docker_tag_spec.rb
+- spec/packer/postprocessors/manifest_spec.rb
 - spec/packer/postprocessors/shell_local_spec.rb
 - spec/packer/postprocessors/vagrant_spec.rb
 - spec/packer/provisioner_spec.rb

data/spec/integration/scripts/kickstart/centos-6.10-ks.cfg

@@ -1,71 +0,0 @@
-install
-cdrom
-lang en_US.UTF-8
-keyboard us
-network --bootproto=dhcp
-rootpw vagrant
-firewall --disabled
-selinux --permissive
-timezone UTC
-unsupported_hardware
-bootloader --location=mbr
-text
-skipx
-zerombr
-clearpart --all --initlabel
-autopart
-auth --enableshadow --passalgo=sha512 --kickstart
-firstboot --disabled
-reboot
-user --name=vagrant --plaintext --password vagrant
-
-%packages --nobase --ignoremissing --excludedocs
-# vagrant needs this to copy initial files via scp
-openssh-clients
-sudo
-kernel-headers
-kernel-devel
-gcc
-make
-perl
-curl
-wget
-nfs-utils
-man
--fprintd-pam
--intltool
-
-# unnecessary firmware
--aic94xx-firmware
--atmel-firmware
--b43-openfwwf
--bfa-firmware
--ipw2100-firmware
--ipw2200-firmware
--ivtv-firmware
--iwl100-firmware
--iwl1000-firmware
--iwl3945-firmware
--iwl4965-firmware
--iwl5000-firmware
--iwl5150-firmware
--iwl6000-firmware
--iwl6000g2a-firmware
--iwl6050-firmware
--libertas-usb8388-firmware
--ql2100-firmware
--ql2200-firmware
--ql23xx-firmware
--ql2400-firmware
--ql2500-firmware
--rt61pci-firmware
--rt73usb-firmware
--xorg-x11-drv-ati-firmware
--zd1211-firmware
-
-%post
-# update root certs
-wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem
-# sudo
-echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant
-sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers