vagrant-pe_build 0.15.1 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dc01290aa45e6619f916cdb4d4ca76a93cf8fe1
-  data.tar.gz: e2a29d63fed2279bb649327c55c8d74add771839
+  metadata.gz: ef07f4d89435b9eb7f7d8d85346e843b604177cb
+  data.tar.gz: 2d276c12ea1fa160e618485e79bfc2f5687b2439
 SHA512:
-  metadata.gz: 329f0132800aa03e946e2b899846d046f4297d5611d500d553c35f6972e57cdfccb3691a2bec3ee55f954275e726d5d39a2f5f68ce2b4b62384355c2450ed4af
-  data.tar.gz: b1174987581eaa70ab99ad200fdda48be9617ac30fffb29bac7b2b5e437915f90f9aad2c60ad557eb52d9cb5defc149a792ee93a256f0aec16a2848c5e855e8b
+  metadata.gz: 1589ad3fdf7cffa79d25627afb5ecb563af2d47ba6f46bf24517a3033a4ef4773c96c0db48aa464b6ae6ad205c6ec850209fa8a29fac0282cfdeaf0192331d57
+  data.tar.gz: 085b4f55a2a087a8cac1078b3308f96390044e861369ae243bb8019022cf4bc85428040edc40fe16d8295c6244bec88a566ebb350e4e5aa8e28574aa2811bbf6

data/.travis.yml

@@ -20,6 +20,6 @@ matrix:
       env: TEST_VAGRANT_VERSION=v1.7.4 BUNDLER_VERSION=1.10.5
 
     - rvm: 2.2.3
-      env: TEST_VAGRANT_VERSION=v1.8.4 BUNDLER_VERSION=1.12.5
+      env: TEST_VAGRANT_VERSION=v1.8.5 BUNDLER_VERSION=1.12.5
     - rvm: 2.2.3
       env: TEST_VAGRANT_VERSION=HEAD BUNDLER_VERSION=1.12.5

data/CHANGELOG

@@ -1,6 +1,28 @@
 vagrant-pe_build
 ================
 
+0.15.3
+------
+
+2016-07-19
+
+This is a backwards compatible bugfix release.
+
+  * (GH-122,GH-123,GH-124) Re-work GPG fix to address issues with the
+    installation process.
+
+0.15.2 -- yanked
+----------------
+
+2016-07-12
+
+**NOTE:** Yanked on 7/18/2016 due to breaking issues caused by the GPG fix.
+
+This is a backwards compatible bugfix release.
+
+  * (GH-120) Fix expired GPG package signing key bundled with PE releases
+    shipped prior to April 29th, 2016.
+
 0.15.1
 ------
 

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ENV['TEST_VAGRANT_VERSION'] ||= 'v1.8.4'
+ENV['TEST_VAGRANT_VERSION'] ||= 'v1.8.5'
 
 # Wrapping gemspec in the :plugins group causes Vagrant 1.5 and newer to
 # automagically load this plugin during acceptance tests.
@@ -18,6 +18,9 @@ group :test do
     gem 'vagrant', :github => 'mitchellh/vagrant', :branch => 'master'
   else
     gem 'vagrant', :github => 'mitchellh/vagrant', :tag => ENV['TEST_VAGRANT_VERSION']
+    # FIXME: Hack to allow Vagrant v1.6.5 to install for tests. Remove when
+    # support for 1.6.5 is dropped.
+    gem 'rack', '< 2'
   end
 
   # Pinned on 12/10/2014. Compatible with Vagrant 1.6.x, 1.7.x and 1.8.x.

data/acceptance/skeletons/2015x_acceptance/Vagrantfile

@@ -9,6 +9,7 @@ end
 
 Vagrant.configure('2') do |config|
   config.pe_build.download_root = ENV['PE_BUILD_DOWNLOAD_ROOT']
+  config.ssh.insert_key = false
 
   config.vm.define 'pe-20161-master' do |node|
     node.vm.hostname = 'pe-20161-master.pe-bootstrap.vlan'

data/acceptance/skeletons/2016x_acceptance/Vagrantfile

@@ -9,6 +9,7 @@ end
 
 Vagrant.configure('2') do |config|
   config.pe_build.download_root = ENV['PE_BUILD_DOWNLOAD_ROOT']
+  config.ssh.insert_key = false
 
   config.vm.define 'pe-20162-master' do |node|
     node.vm.hostname = 'pe-20162-master.pe-bootstrap.vlan'

data/acceptance/skeletons/pe_build/Vagrantfile

@@ -7,6 +7,7 @@ end
 
 Vagrant.configure('2') do |config|
   config.pe_build.download_root = ENV['PE_BUILD_DOWNLOAD_ROOT']
+  config.ssh.insert_key = false
   # This is the box name used by the setup helpers in the acceptance tests.
   config.vm.box = 'centos'
 

data/data/vagrant-pe_build/files/GPG-KEY-puppetlabs

@@ -0,0 +1,77 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+bvHQdAXF9w==
+=t3lA
+-----END PGP PUBLIC KEY BLOCK-----

data/lib/pe_build/cap/run_install/posix.rb

@@ -10,15 +10,35 @@ class PEBuild::Cap::RunInstall::POSIX
   # @param installer_dir [String] A path to the directory where PE installers
   #   are kept.
   # @param answers [String] A path to a file containing installation answers.
-  # @option options [Boolean] A flag which controls whether the PEM installer
-  #   introduced in 2016.2 should be used.
+  #
+  # @param options [Hash] Additional options that influence installer behavior.
+  # @option options [Boolean] :use_pem A flag which controls whether the PEM
+  #   installer introduced in 2016.2 should be used.
+  # @option options [Boolean] :update_gpg A flag which controls whether the
+  #   GPG key shipped with th
+  #   installer introduced in 2016.2 should be used.
   #
   # @return [void]
   def self.run_install(machine, installer_path, answers, **options)
+
     if options.fetch(:use_pem, false)
-      on_machine(machine, "#{installer_path} -c #{answers}")
+      on_machine(machine, "#{installer_path}/puppet-enterprise-installer -c #{answers}")
     else
-      on_machine(machine, "#{installer_path} -a #{answers}")
+      on_machine(machine, "#{installer_path}/puppet-enterprise-installer -a #{answers}")
+    end
+
+    # Update GPG key used by pe_repo.
+    if options.fetch(:update_gpg, false)
+      machine.ui.info I18n.t('pebuild.cap.run_install.updating_pe_repo_gpg_key')
+      on_machine(machine, <<-EOS)
+if [ -e #{installer_path}/gpg/GPG-KEY-puppetlabs ]; then
+  if [ -e /opt/puppetlabs/puppet/modules/pe_repo ]; then
+    cp #{installer_path}/gpg/GPG-KEY-puppetlabs /opt/puppetlabs/puppet/modules/pe_repo/files/GPG-KEY-puppetlabs
+  elif [ -e /opt/puppet/share/puppet/modules/pe_repo ]; then
+    cp #{installer_path}/gpg/GPG-KEY-puppetlabs /opt/puppet/share/puppet/modules/pe_repo/files/GPG-KEY-puppetlabs
+  fi
+fi
+EOS
     end
 
     if machine.communicate.test('which at')

data/lib/pe_build/cap/run_install/windows.rb

@@ -11,6 +11,8 @@ class PEBuild::Cap::RunInstall::Windows
   # @param answers [Hash[String => String}] A hash of options that will be
   #   passed to msiexec as `key=value` pairs.
   #
+  # @param options [Hash] Additional options that influence installer behavior.
+  #
   # @return [void]
   def self.run_install(machine, installer_path, answers, **options)
     install_options = answers.map{|e| e.join('=')}.join(' ')

data/lib/pe_build/provisioner/pe_bootstrap.rb

@@ -182,22 +182,42 @@ module PEBuild
             'PUPPET_AGENT_CERTNAME' => machine.name,
           }
 
+          # These options are only used on POSIX nodes.
           use_pem = false
+          update_gpg = false
         else
           if @config.shared_installer
             root = File.join('/vagrant', PEBuild::WORK_DIR)
-            installer_path = File.join(root, @archive.installer_dir, 'puppet-enterprise-installer')
+            installer_path = File.join(root, @archive.installer_dir)
             answers = File.join(root, 'answers', "#{machine.name}.txt")
           else
-            installer_path = File.join(@archive.installer_dir, 'puppet-enterprise-installer')
-            answers = File.join("#{machine.name}.txt")
+            installer_path = @archive.installer_dir
+            answers = "#{machine.name}.txt"
           end
 
           # Run a PEM install if the PE version is 2016.2.0 or newer.
           use_pem = (PEBuild::Util::VersionString.compare(@config.version, '2016.2.0') >= 0)
+
+          # PE versions shipped prior to April 29th, 2016 were packaged with a
+          # GPG key that expired on July 8th, 2016.
+          update_gpg = (PEBuild::Util::VersionString.compare(@config.version, '3.8.5') < 0) ||
+           ((PEBuild::Util::VersionString.compare(@config.version, '2015.2.0') >= 0) &&
+            (PEBuild::Util::VersionString.compare(@config.version, '2016.1.2') < 0))
+
+          if update_gpg
+            machine.ui.info(
+              I18n.t('pebuild.provisioner.pe_bootstrap.updating_gpg_key',
+                :version => @config.version))
+            machine.communicate.upload(
+              File.join(
+                PEBuild.source_root,
+                'data', 'vagrant-pe_build', 'files', 'GPG-KEY-puppetlabs'),
+              "#{installer_path}/gpg/GPG-KEY-puppetlabs")
+          end
         end
 
-        machine.guest.capability('run_install', installer_path, answers, use_pem: use_pem)
+        machine.guest.capability('run_install', installer_path, answers,
+          use_pem: use_pem, update_gpg: update_gpg)
       end
 
       def run_postinstall_tasks

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.15.1'
+  VERSION = '0.15.3'
 end

data/templates/locales/en.yml

@@ -26,6 +26,8 @@ en:
         "%{message}"
     provisioner:
       pe_bootstrap:
+        updating_gpg_key: |-
+          Updating expired GPG key bundled with PE %{version} installer.
         post_install: |-
           Applying post-install configuration to Puppet Enterprise.
         already_installed: |-
@@ -134,6 +136,8 @@ en:
           Downloading PE installer from:
             %{url}
       run_install:
+        updating_pe_repo_gpg_key:
+          Updating GPG keys used by pe_repo.
         scheduling_run: |-
           Scheduling Puppet run to kickstart node classification.
       detect_installer:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.3
 platform: ruby
 authors:
 - Adrien Thebo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
@@ -92,6 +92,7 @@ files:
 - acceptance/skeletons/2015x_acceptance/Vagrantfile
 - acceptance/skeletons/2016x_acceptance/Vagrantfile
 - acceptance/skeletons/pe_build/Vagrantfile
+- data/vagrant-pe_build/files/GPG-KEY-puppetlabs
 - doc/answers/README.markdown
 - doc/answers/agent.txt
 - doc/answers/master-1.1.txt