vagrant-pe_build 0.17.2 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6554b62801c7a3c7ad0b0df7a07fe114d683d59
-  data.tar.gz: 3c5e00f4fb8b670453c1b1124e269b2769ea1810
+  metadata.gz: a02539fb15d4f8edef39d6a17306b8b676d4bcc6
+  data.tar.gz: f08dfb2c65dbb7977f87734f54017d9e8a17aee6
 SHA512:
-  metadata.gz: 295a5458ef78cd65073af65ae83a4c003b3ad5978932f47a87cb64642b5c38b2b46887990f789f235f2f9f7664401f84f94449acd751f212c5f399d0dbf2ebbb
-  data.tar.gz: f0fae21a1d7c0939b50c9f24fd77aa6f6032edfcd9892bc00dd282e09efae13d685d464feae2835f7819581a5ef49fd7420f262b4735f9d94af311df4883e7ee
+  metadata.gz: a0adbdefda1f2aecd1ab0c6df065102678fe68d48480ca93feea27fb176d7fc86204ed6872fbbdb3a846c1e7616cc740c906c9a99b8fad7d5a9fd6a987d3f693
+  data.tar.gz: fe2a0692e87d52d0fd7ff752dd31ba2e58fd6548af415f37507417e18f87ea2c0335605d7d4523a887c251a488835343a88c69fb71e963a4d5d929485c8a040f

data/.travis.yml

@@ -21,6 +21,6 @@ matrix:
     - rvm: 2.2.5
       env: TEST_VAGRANT_VERSION=v1.8.7 BUNDLER_VERSION=1.12.5
     - rvm: 2.2.5
-      env: TEST_VAGRANT_VERSION=v1.9.1 BUNDLER_VERSION=1.13.6
+      env: TEST_VAGRANT_VERSION=v1.9.3 BUNDLER_VERSION=1.13.6
     - rvm: 2.2.5
       env: TEST_VAGRANT_VERSION=HEAD BUNDLER_VERSION=1.13.6

data/CHANGELOG

@@ -1,6 +1,23 @@
 vagrant-pe_build
 ================
 
+0.17.3
+------
+
+2017-04-12
+
+This is a backwards compatible bugfix release.
+
+  * (GH-134) Allow dns-alt-names in cert requests for provisioning
+    compile masters.
+
+  * (GH-135) Fix GPG key updates for 2.7, 2.8 and 2016.2.
+
+  * (GH-130) Deprecate Vagrant versions earlier than 1.8.
+
+  * Add support for 2016.4.4, 2017.1.0, 2017.1.1 and 2017.2.0.
+
+
 0.17.2
 ------
 

data/Gemfile

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
+require 'rubygems/version'
 
-ENV['TEST_VAGRANT_VERSION'] ||= 'v1.9.1'
+vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v1.9.3'
+vagrant_version = nil
 
 # Wrapping gemspec in the :plugins group causes Vagrant 1.5 and newer to
 # automagically load this plugin during acceptance tests.
@@ -14,17 +16,28 @@ group :development do
 end
 
 group :test do
-  if ENV['TEST_VAGRANT_VERSION'] == 'HEAD'
-    gem 'vagrant', :github => 'mitchellh/vagrant', :branch => 'master'
+  case vagrant_branch
+  when /head/i
+    gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant.git',
+      :branch => 'master'
   else
-    gem 'vagrant', :github => 'mitchellh/vagrant', :tag => ENV['TEST_VAGRANT_VERSION']
+    vagrant_version = Gem::Version.new(vagrant_branch.sub(/^v/, ''))
+    gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant.git',
+      :tag => vagrant_branch
     # 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.
-  gem 'vagrant-spec', :github => 'mitchellh/vagrant-spec', :ref => '1df5a3a'
+  if vagrant_branch.match(/head/i) || (vagrant_version > Gem::Version.new('1.9.3'))
+    # Pinned on 4/11/2017. Compatible with Vagrant > 1.9.3.
+    gem 'vagrant-spec', :git => 'https://github.com/mitchellh/vagrant-spec.git',
+      :ref => '1d09951'
+  elsif vagrant_version
+    # Pinned on 12/10/2014. Compatible with Vagrant 1.6.x -- 1.9.3.
+    gem 'vagrant-spec', :git => 'https://github.com/mitchellh/vagrant-spec.git',
+      :ref => '1df5a3a'
+  end
 end
 
 eval_gemfile "#{__FILE__}.local" if File.exists? "#{__FILE__}.local"

data/lib/pe_build/action/version_check.rb

@@ -0,0 +1,23 @@
+require 'vagrant/version'
+require 'rubygems/version'
+
+# Check for deprecated Vagrant versions
+class PEBuild::Action::VersionCheck
+  MINIMUM_VERSION = '1.8.0'
+
+  def initialize(app, env)
+    @app = app
+  end
+
+  def call(env)
+    unless Gem::Version.new(Vagrant::VERSION) > Gem::Version.new(MINIMUM_VERSION)
+      env[:env].ui.warn I18n.t(
+        'pebuild.action.version_check.deprecated_vagrant_version',
+        minimum_version: MINIMUM_VERSION,
+        vagrant_version: Vagrant::VERSION
+      )
+    end
+
+    @app.call(env)
+  end
+end

data/lib/pe_build/action.rb

@@ -1,5 +1,6 @@
 module PEBuild
   module Action
     require 'pe_build/action/pe_build_dir'
+    require 'pe_build/action/version_check'
   end
 end

data/lib/pe_build/plugin.rb

@@ -155,6 +155,10 @@ module PEBuild
 
 
     # internal action hooks
+    action_hook('PE Build: vagrant version check', :environment_load) do |hook|
+      require 'pe_build/action'
+      hook.prepend PEBuild::Action::VersionCheck
+    end
 
     action_hook('PE Build: initialize build dir') do |hook|
       require 'pe_build/action'

data/lib/pe_build/provisioner/pe_agent.rb

@@ -214,7 +214,7 @@ bash pe_frictionless_installer.sh
         shell_config.privileged = true
         # TODO: Extend paths to PE 3.x masters.
         shell_config.inline = <<-EOS
-/opt/puppetlabs/bin/puppet cert sign #{agent_certname}
+/opt/puppetlabs/bin/puppet cert --allow-dns-alt-names sign #{agent_certname}
         EOS
         shell_config.finalize!
 

data/lib/pe_build/provisioner/pe_bootstrap.rb

@@ -200,17 +200,32 @@ module PEBuild
 
           # PE versions prior to 2016.4.0 were signed with a GPG key that
           # expired on January 2nd, 2017.
-          update_gpg = (PEBuild::Util::VersionString.compare(@config.version, '2016.4.0') < 0)
+          #
+          # Packages weren't signed with GPG keys prior to PE 2.7.0.
+          update_gpg = (PEBuild::Util::VersionString.compare(@config.version, '2016.4.0') < 0) &&
+            (PEBuild::Util::VersionString.compare(@config.version, '2.7.0') > 0)
 
           if update_gpg
+            key_path = if (PEBuild::Util::VersionString.compare(@config.version, '2016.2.0') >= 0)
+              "#{installer_path}/packages/GPG-KEY-puppetlabs"
+            elsif (PEBuild::Util::VersionString.compare(@config.version, '3.0.0') >= 0)
+              # PE 3.0.0 -- 2016.1.2
+              "#{installer_path}/gpg/GPG-KEY-puppetlabs"
+            else
+              # PE 2.7 and 2.8
+              "#{installer_path}/gpg/RPM-GPG-KEY-puppetlabs"
+            end
+
             machine.ui.info(
               I18n.t('pebuild.provisioner.pe_bootstrap.updating_gpg_key',
-                :version => @config.version))
+                :version => @config.version,
+                :key_path => key_path))
+
             machine.communicate.upload(
               File.join(
                 PEBuild.source_root,
                 'data', 'vagrant-pe_build', 'files', 'GPG-KEY-puppetlabs'),
-              "#{installer_path}/gpg/GPG-KEY-puppetlabs")
+              key_path)
           end
         end
 

data/lib/pe_build/release/2016_4.rb

@@ -30,4 +30,5 @@ module PEBuild::Release
   @releases['2016.4.1'] = twentysixteen_four_x
   @releases['2016.4.2'] = twentysixteen_four_x
   @releases['2016.4.3'] = twentysixteen_four_x
+  @releases['2016.4.4'] = twentysixteen_four_x
 end

data/lib/pe_build/release/2017_1.rb

@@ -0,0 +1,32 @@
+require 'pe_build/release'
+
+module PEBuild::Release
+
+  twentyseventeen_one_x = newrelease do
+
+    add_release :el, '6'
+    add_release :el, '7'
+
+    add_release :sles, '11'
+    add_release :sles, '12'
+
+    add_release :ubuntu, '12.04'
+    add_release :ubuntu, '14.04'
+    add_release :ubuntu, '16.04'
+
+    add_release :windows, '2008'
+    add_release :windows, '2008R2'
+    add_release :windows, '2012'
+    add_release :windows, '2012R2'
+    add_release :windows, '2016'
+    add_release :windows, '7'
+    add_release :windows, '8'
+    add_release :windows, '8.1'
+    add_release :windows, '10'
+
+    set_answer_file :master, File.join(PEBuild.template_dir, 'answers', 'master-2016.2.x.conf.erb')
+  end
+
+  @releases['2017.1.0'] = twentyseventeen_one_x
+  @releases['2017.1.1'] = twentyseventeen_one_x
+end

data/lib/pe_build/release/2017_2.rb

@@ -0,0 +1,31 @@
+require 'pe_build/release'
+
+module PEBuild::Release
+
+  twentyseventeen_two_x = newrelease do
+
+    add_release :el, '6'
+    add_release :el, '7'
+
+    add_release :sles, '11'
+    add_release :sles, '12'
+
+    add_release :ubuntu, '12.04'
+    add_release :ubuntu, '14.04'
+    add_release :ubuntu, '16.04'
+
+    add_release :windows, '2008'
+    add_release :windows, '2008R2'
+    add_release :windows, '2012'
+    add_release :windows, '2012R2'
+    add_release :windows, '2016'
+    add_release :windows, '7'
+    add_release :windows, '8'
+    add_release :windows, '8.1'
+    add_release :windows, '10'
+
+    set_answer_file :master, File.join(PEBuild.template_dir, 'answers', 'master-2016.2.x.conf.erb')
+  end
+
+  @releases['2017.2.0'] = twentyseventeen_two_x
+end

data/lib/pe_build/release.rb

@@ -43,7 +43,9 @@ module PEBuild
     require 'pe_build/release/2016_2'
     require 'pe_build/release/2016_4'
     require 'pe_build/release/2016_5'
+    require 'pe_build/release/2017_1'
+    require 'pe_build/release/2017_2'
 
-    LATEST_VERSION = '2016.5.2'
+    LATEST_VERSION = '2017.1.1'
   end
 end

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.17.2'
+  VERSION = '0.17.3'
 end

data/templates/answers/master-pe_next.conf.erb

@@ -0,0 +1,25 @@
+# Stock all-in-one answers for 2017.2.0 and newer
+"console_admin_password": "puppetlabs"
+
+"node_roles": {
+  # Primary Roles:
+  #   (If you modify any of these roles, make sure to start by replacing
+  #   "%{::trusted.certname}" with the real name of the primary master.)
+  "pe_role::monolithic::primary_master": ["<%= machine_hostname %>"]
+  "pe_role::monolithic::primary_master_replica": []
+
+  # Secondary Roles:
+  "pe_role::monolithic::compile_master": []
+  "pe_role::monolithic::mco_hub": []
+  "pe_role::monolithic::mco_broker": []
+}
+
+"agent_platforms": [
+   "%{::platform_tag}",
+]
+
+"meep_schema_version": "2.0"
+
+# Additional customization
+"puppet_enterprise::profile::master::check_for_updates": false
+"puppet_enterprise::send_analytics_data": false

data/templates/locales/en.yml

@@ -1,5 +1,11 @@
 en:
   pebuild:
+    action:
+      version_check:
+        deprecated_vagrant_version: |-
+          The vagrant-pe_build plugin has deprecated support for Vagrant
+          versions older than %{minimum_version}. Support for version %{vagrant_version}
+          will be removed in the next major release of the plugin.
     command:
       facts:
         vm_not_running: |-
@@ -27,7 +33,8 @@ en:
     provisioner:
       pe_bootstrap:
         updating_gpg_key: |-
-          Updating expired GPG key bundled with PE %{version} installer.
+          Updating expired GPG key bundled with PE %{version} installer:
+            %{key_path}
         post_install: |-
           Applying post-install configuration to Puppet Enterprise.
         already_installed: |-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.3
 platform: ruby
 authors:
 - Adrien Thebo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
@@ -102,6 +102,7 @@ files:
 - lib/pe_build.rb
 - lib/pe_build/action.rb
 - lib/pe_build/action/pe_build_dir.rb
+- lib/pe_build/action/version_check.rb
 - lib/pe_build/archive.rb
 - lib/pe_build/archive_collection.rb
 - lib/pe_build/cap.rb
@@ -158,6 +159,8 @@ files:
 - lib/pe_build/release/2016_2.rb
 - lib/pe_build/release/2016_4.rb
 - lib/pe_build/release/2016_5.rb
+- lib/pe_build/release/2017_1.rb
+- lib/pe_build/release/2017_2.rb
 - lib/pe_build/release/2_0.rb
 - lib/pe_build/release/2_5.rb
 - lib/pe_build/release/2_6.rb
@@ -205,6 +208,7 @@ files:
 - templates/answers/master-2015.x.txt.erb
 - templates/answers/master-2016.2.x.conf.erb
 - templates/answers/master-3.x.txt.erb
+- templates/answers/master-pe_next.conf.erb
 - templates/locales/en.yml
 - vagrant-pe_build.gemspec
 - vagrant-spec.config.example.rb