vagrant-pe_build 0.13.7 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fb108a09ab72f010038b21ddc2933bf0efe832c
-  data.tar.gz: fbdb45d716f89915161d5b03544d652e0c7470fc
+  metadata.gz: aa2b46e048a5920609c5e99569e2f9465fbae3fa
+  data.tar.gz: f6040fefce357fe8921d77752972cb62cf19fc8a
 SHA512:
-  metadata.gz: 0386ae66e02cf584543d6a6d59a620daec5bf132f9dbfec7f6d3659347c7e645446801f95a6ea36b6f479de0ed613eabe0def88c9bb02f9c267f0fda75909fe6
-  data.tar.gz: 0c8ff26242f7b9de5a74633591e8158169b3804a3e7969f120a5506e4f1849c685576d660282250c1b3f25d65fac98cd8623c55378934bdb08fb1b48e2a86837
+  metadata.gz: d76bfcb63e366be1e748c5158878cbeb3b0c606999a95b47ce1b300171b9e357d5e4df6209604bebae54e614dca224102ffffc7bc31f7146cf4dc0aa325b08f9
+  data.tar.gz: 0d0e9dae36cb87e9c33a340e87296a00a2e0023001956020ce11cea8a5358ad81a080ee15246f5e4e390ce06aec4c633883470edb94cbfeca3ab596851d6996d

data/CHANGELOG

@@ -1,6 +1,31 @@
 vagrant-pe_build
 ================
 
+0.14.0
+------
+
+2016-03-26
+
+The is a backwards compatible feature release.
+
+  * (GH-40) The pe_bootstrap provisioner has been refactored to skip most
+    actions if PE is already installed.
+
+  * (GH-78) Provisioners running Windows installs now wait for msiexec to
+    complete and write logs to puppet-enterprise-installer.log.
+
+  * (GH-110) The pe_agent provisioner now installs Windows agents using packages
+    provided by pe_repo instead of falling back to the pe_bootstrap installer.
+
+  * (GH-112) The pe_boostrap provisioner can be configured to download
+    installers directly to the vm instead of relying on the /vagrant shared
+    filesystem by setting shared_installer to false. This is useful for
+    compute environments such as AWS and OpenStack where VMs are not running
+    directly on the Vagrant host.
+
+  * Add support for PE 3.8.4, 2015.3.3 and 2016.1.0.
+
+
 0.13.7
 ------
 

data/README.markdown

@@ -25,7 +25,7 @@ optional and can be overridden in a VM's individual provisioner config.
   * `config.pe_build.version_file`
     * Description: A fully-qualified URI or a path relative to `download_root`. The contents of this file will be read and used to set `version` --- overriding any value that may already be set.
   * `config.pe_build.suffix` - Suffix of the Puppet Enterprise installer to use.
-    * Description: The distribution specifix suffix of the Puppet Enterprise
+    * Description: The distribution specific suffix of the Puppet Enterprise
       installer to use.
     * Default: `:detect`
   * `config.pe_build.filename`
@@ -41,6 +41,11 @@ optional and can be overridden in a VM's individual provisioner config.
       * ftp
       * file
       * A blank URI will default to `file`.
+  * `config.pe_build.shared_installer`
+    * Description: Whether to run PE installation using installers and answers
+      shared using the `/vagrant` directory. If set to `false`, resources will
+      be downloaded remotely from `download_root`
+      to the home directory of whichever user account Vagrant is using. Defaults to `true`.
 
 ### `pe_bootstrap` Provisioner Settings
 
@@ -113,11 +118,7 @@ with the global `config.pe_build` settings.
       `master_vm` is set and `master_vm` if `vm.hostname` is not set.
   * `version`
     * Description: The version number of the PE Agent to install. **NOTE:**
-      this setting is currently used only for Windows agents. POSIX agents will
-      always receive the `'current'` version installed on the master. Support
-      for setting the version number of POSIX agents will be added in a future
-      release.
-    * Options: A version string, `x.y.z[-optional-stuff]`, or the string
+      Currently, agents always receive the `'current'` version installed on the master. Support for setting the version number of agents will be added in a future release. * Options: A version string, `x.y.z[-optional-stuff]`, or the string
       `'current'`.
     * Default: `'current'`.
 
@@ -135,10 +136,10 @@ added with `vagrant pe-build copy`.
 
 ```ruby
 Vagrant.configure('2') do |config|
-  config.pe_build.version = '3.8.2'
+  config.pe_build.version = '3.8.4'
 
   config.vm.define 'master' do |node|
-    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+    node.vm.box = 'puppetlabs/centos-7.2-64-nocm'
 
     node.vm.provision :pe_bootstrap do |p|
       p.role = :master
@@ -146,7 +147,7 @@ Vagrant.configure('2') do |config|
   end
 
   config.vm.define 'agent1' do |node|
-    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+    node.vm.box = 'puppetlabs/centos-7.2-64-nocm'
     node.vm.provision :pe_bootstrap
   end
 end
@@ -160,10 +161,10 @@ of `pe_bootstrap`.
 
 ```ruby
 Vagrant.configure('2') do |config|
-  config.pe_build.version = '2015.2.2'
+  config.pe_build.version = '2015.3.3'
 
   config.vm.define 'master' do |node|
-    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+    node.vm.box = 'puppetlabs/centos-7.2-64-nocm'
 
     node.vm.provision :pe_bootstrap do |p|
       p.role = :master
@@ -171,7 +172,7 @@ Vagrant.configure('2') do |config|
   end
 
   config.vm.define 'agent1' do |node|
-    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+    node.vm.box = 'puppetlabs/centos-7.2-64-nocm'
     node.vm.provision :pe_agent do |p|
       p.master_vm = 'master'
     end
@@ -184,14 +185,14 @@ end
 
 ```ruby
 Vagrant.configure('2') do |config|
-  config.pe_build.version = '3.8.2'
+  config.pe_build.version = '3.8.4'
   config.pe_build.download_root = 'http://my.pe.download.mirror/installers'
 
   # Alternately, a local directory can be specified
   #config.pe_build.download_root = 'file://Users/luke/Downloads'
 
   config.vm.define 'master' do |node|
-    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+    node.vm.box = 'puppetlabs/centos-7.2-64-nocm'
 
     node.vm.provision :pe_bootstrap do |p|
       p.role = :master
@@ -199,7 +200,7 @@ Vagrant.configure('2') do |config|
   end
 
   config.vm.define 'agent1' do |node|
-    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+    node.vm.box = 'puppetlabs/centos-7.2-64-nocm'
 
     node.vm.provision :pe_bootstrap
   end
@@ -211,14 +212,14 @@ end
 
 ```ruby
 Vagrant.configure('2') do |config|
-  config.pe_build.version = '3.8.2'
+  config.pe_build.version = '3.8.4'
   config.pe_build.download_root = 'http://my.pe.download.mirror/installers'
 
   # Alternately, a local directory can be specified
   #config.pe_build.download_root = 'file://Users/luke/Downloads'
 
   config.vm.define 'master' do |node|
-    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+    node.vm.box = 'puppetlabs/centos-7.2-64-nocm'
 
     node.vm.provision :pe_bootstrap do |p|
       p.role = :master
@@ -227,7 +228,7 @@ Vagrant.configure('2') do |config|
   end
 
   config.vm.define 'agent1' do |node|
-    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+    node.vm.box = 'puppetlabs/centos-7.2-64-nocm'
 
     node.vm.provision :pe_bootstrap
   end
@@ -235,18 +236,15 @@ end
 ```
 
 
-### Manually setting a filename
+### Manually setting an installer filename
 
 ```ruby
 Vagrant.configure('2') do |config|
-  config.pe_build.version  = '3.8.2'
-  config.pe_build.filename = 'puppet-enterprise-3.8.2-el-7-x86_64.tar.gz'
-
-  # Alternately, a local directory can be specified
-  #config.pe_build.download_root = 'file://Users/luke/Downloads'
+  config.pe_build.version  = '3.8.4'
+  config.pe_build.filename = 'puppet-enterprise-3.8.4-el-7-x86_64.tar.gz'
 
   config.vm.define 'master' do |node|
-    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+    node.vm.box = 'puppetlabs/centos-7.2-64-nocm'
 
     node.vm.provision :pe_bootstrap do |p|
       p.role = :master
@@ -254,7 +252,7 @@ Vagrant.configure('2') do |config|
   end
 
   config.vm.define 'agent1' do |node|
-    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+    node.vm.box = 'puppetlabs/centos-7.2-64-nocm'
 
     node.vm.provision :pe_bootstrap
   end

data/lib/pe_build/archive.rb

@@ -64,7 +64,7 @@ module PEBuild
         raise PEBuild::ArchiveNoInstallerSource, :filename => versioned_path(@filename)
       end
 
-      uri = URI.parse(versioned_path("#{str}/#{@filename}"))
+      uri = source_uri(str)
       dst = File.join(@archive_dir, versioned_path(@filename))
 
       PEBuild::Transfer.copy(uri, dst)
@@ -94,6 +94,11 @@ module PEBuild
       versioned_path(@filename)
     end
 
+    # @param base_uri [String, URI] A base uri for downloads.
+    def source_uri(base_uri)
+      URI.parse(versioned_path("#{base_uri.to_s}/#{@filename}"))
+    end
+
     def installer_dir
       versioned_path(@filename).gsub(/.tar(?:\.gz)?/, '')
     end

data/lib/pe_build/cap.rb

@@ -30,5 +30,10 @@ module PEBuild
       require 'pe_build/cap/run_install/posix'
       require 'pe_build/cap/run_install/windows'
     end
+
+    module StageInstaller
+      require 'pe_build/cap/stage_installer/posix'
+      require 'pe_build/cap/stage_installer/windows'
+    end
   end
 end

data/lib/pe_build/cap/detect_installer/debian.rb

@@ -13,7 +13,7 @@ class PEBuild::Cap::DetectInstaller::Debian < PEBuild::Cap::DetectInstaller::POS
   end
 
   def supported_releases
-    %w[6 7]
+    %w[6 7 8]
   end
 
   def arch

data/lib/pe_build/cap/detect_installer/sles.rb

@@ -13,7 +13,7 @@ class PEBuild::Cap::DetectInstaller::SLES < PEBuild::Cap::DetectInstaller::POSIX
   end
 
   def supported_releases
-    %w[11]
+    %w[10 11 12]
   end
 end
 

data/lib/pe_build/cap/detect_installer/ubuntu.rb

@@ -13,7 +13,7 @@ class PEBuild::Cap::DetectInstaller::Ubuntu < PEBuild::Cap::DetectInstaller::POS
   end
 
   def supported_releases
-    %w[10.04 12.04 14.04]
+    %w[10.04 12.04 14.04 15.04 15.10]
   end
 
   def arch

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

@@ -3,31 +3,15 @@ class PEBuild::Cap::RunInstall::POSIX
 
   extend PEBuild::OnMachine
 
-  def self.run_install(machine, config, archive)
-
-    # NOTE: This test for both the 3.x and 4.x installation locations. Should
-    # probably refactor this into something cleaner.
-    if machine.communicate.test('test -f /opt/puppet/pe_version || test -f /opt/puppetlabs/server/pe_version')
-      machine.ui.warn I18n.t('pebuild.cap.run_install.already_installed'),
-                      :name  => machine.name
-      return
-    end
-
-    root = File.join('/vagrant', PEBuild::WORK_DIR)
-
-    cmd_path = []
-    cmd_path << root
-
-    cmd_path << archive.installer_dir
-    cmd_path << "puppet-enterprise-installer"
-
-    cmd     = File.join(cmd_path)
-    answers = File.join(root, 'answers', "#{machine.name}.txt")
-
-    argv = "#{cmd} -a #{answers}"
-
-    on_machine(machine, argv)
-
+  # Run the PE installer on POSIX systems
+  #
+  # @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.
+  #
+  # @return [void]
+  def self.run_install(machine, installer_path, answers)
+    on_machine(machine, "#{installer_path} -a #{answers}")
 
     if machine.communicate.test('which at')
       machine.ui.info I18n.t('pebuild.cap.run_install.scheduling_run')

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

@@ -3,34 +3,31 @@ class PEBuild::Cap::RunInstall::Windows
 
   extend PEBuild::OnMachine
 
-  def self.run_install(machine, config, archive)
-
-    gt_win2k3_path = '${Env:ALLUSERSPROFILE}\\PuppetLabs'
-    le_win2k3_path = '${Env:ALLUSERSPROFILE}\\Application Data\\PuppetLabs'
-    testpath = "(Test-Path \"#{gt_win2k3_path}\") -or (Test-Path \"#{le_win2k3_path}\")"
-
-    if machine.communicate.test("If (#{testpath}) { Exit 0 } Else { Exit 1 }")
-      machine.ui.warn I18n.t('pebuild.cap.run_install.already_installed'),
-        :name => machine.name
-      return
-    end
-
-    root = machine.communicate.shell.cmd('ECHO %SYSTEMDRIVE%')[:data][0][:stdout].chomp
-    root = File.join("#{root}\\vagrant", PEBuild::WORK_DIR)
-
-    # The installer will be fed to msiexec. That means the File.join() method
-    # is of limited use since it won't execute on the Windows system
-    installer = File.join(root, archive.to_s).gsub('/', '\\')
-
-    cmd = []
-    cmd << 'msiexec' << '/qn' << '/i' << installer
-
-    cmd << "PUPPET_MASTER_SERVER=#{config.master}"
-    cmd << "PUPPET_AGENT_CERTNAME=#{machine.name}"
-
-    argv = cmd.join(' ')
-
-    on_machine(machine, argv)
-
+  # Run the PE installer on Windows systems
+  #
+  # @param installer_dir [String] A path to the PE installer.
+  # @param answers [Hash[String => String}] A hash of options that will be
+  #   passed to msiexec as `key=value` pairs.
+  #
+  # @return [void]
+  def self.run_install(machine, installer_path, answers)
+    install_options = answers.map{|e| e.join('=')}.join(' ')
+    # Lots of PowerShell commands can handle UNIX-style paths. msiexec can't.
+    installer_path = installer_path.gsub('/', '\\')
+
+    cmd = <<-EOS
+$params = @(
+  "/qn",
+  "/i `"#{installer_path}`"",
+  "/l*v puppet-enterprise-installer.log",
+  "#{install_options}"
+)
+
+(Start-Process -FilePath "msiexec.exe" -ArgumentList $params -Wait -Passthru).ExitCode
+EOS
+
+    machine.ui.info "Running: #{cmd}"
+
+    on_machine(machine, cmd)
   end
 end

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

@@ -0,0 +1,38 @@
+require 'pe_build/on_machine'
+
+# Download PE installers to a POSIX VM
+#
+# @since 0.14.0
+class PEBuild::Cap::StageInstaller::POSIX
+
+  extend PEBuild::OnMachine
+
+  # Download an installer to a remote VM
+  #
+  # @param uri [URI] A URI containing the download source.
+  # @param dest_dir [String] The destination directory to download the
+  #   installer to.
+  #
+  # @return [void]
+  def self.stage_installer(machine, uri, dest_dir='.')
+    filename = File.basename(uri.path)
+    installer_dir = filename.gsub(/.tar(?:\.gz)?/, '')
+
+    # GNU tar will attempt to guess the file format. Other versions of tar,
+    # such as those shipped with Solaris, take the approach that trying to
+    # interpret unknown binaries is none of their business.
+    tar_flags = if filename.end_with?('.tar.gz')
+      'xzf'
+    else
+      'xf'
+    end
+
+    unless machine.communicate.test("test -d #{dest_dir}/#{installer_dir}")
+      machine.ui.info I18n.t('pebuild.cap.stage_installer.downloading_installer',
+        :url => uri)
+
+      on_machine(machine, "curl -fsSLk #{uri} -o #{dest_dir}/#{filename}")
+      on_machine(machine, "tar #{tar_flags} #{dest_dir}/#{filename} -C #{dest_dir}")
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+require 'pe_build/on_machine'
+
+# Download PE installers to a Windows VM
+#
+# @since 0.14.0
+class PEBuild::Cap::StageInstaller::Windows
+
+  extend PEBuild::OnMachine
+
+  # Download an installer to a remote VM
+  #
+  # @param uri [URI] A URI containing the download source.
+  # @param dest_dir [String] The destination directory to download the
+  #   installer to.
+  #
+  # @return [void]
+  def self.stage_installer(machine, uri, dest_dir='.')
+    filename = File.basename(uri.path)
+
+    unless machine.communicate.test(%Q[If (Test-Path "#{dest_dir}/#{filename}) { Exit 0 } Else { Exit 1 }])
+      machine.ui.info I18n.t('pebuild.cap.stage_installer.downloading_installer',
+        :url => uri)
+
+      # Setting ServerCertificateValidationCallback to always return true
+      # allows us to download from HTTPS sources that present a self-signed
+      # certificate. For example, a Puppet Master.
+      on_machine(machine, <<-EOS)
+[System.Net.ServicePointManager]::ServerCertificateValidationCallback = {$true}
+(New-Object System.Net.WebClient).DownloadFile("#{uri}","#{dest_dir}/#{filename}")
+EOS
+    end
+  end
+end

data/lib/pe_build/config/global.rb

@@ -45,6 +45,15 @@ class PEBuild::Config::Global < Vagrant.plugin('2', :config)
   #   @since 0.1.0
   attr_accessor :filename
 
+  # @!attribute shared_installer
+  #   @return [Boolean] Whether to run PE installation using installers and
+  #     answers shared using the `/vagrant` mount. If set to `false`, resources
+  #     will be downloaded remotely to the home directory of whichever user
+  #     account Vagrant is using. Defaults to `true`.
+  #
+  #   @since 0.14.0
+  attr_accessor :shared_installer
+
   def initialize
     @download_root = UNSET_VALUE
     @version       = UNSET_VALUE
@@ -52,6 +61,7 @@ class PEBuild::Config::Global < Vagrant.plugin('2', :config)
     @series        = UNSET_VALUE
     @suffix        = UNSET_VALUE
     @filename      = UNSET_VALUE
+    @shared_installer = UNSET_VALUE
   end
 
   include PEBuild::ConfigDefault
@@ -63,6 +73,7 @@ class PEBuild::Config::Global < Vagrant.plugin('2', :config)
     set_default :@suffix, :detect
     set_default :@download_root, nil
     set_default :@filename, nil
+    set_default :@shared_installer, true
   end
 
   def validate(machine)

data/lib/pe_build/config_builder.rb

@@ -1,7 +1,13 @@
+require 'config_builder/version'
+
 module PEBuild
   module ConfigBuilder
-    require 'pe_build/config_builder/global'
-    require 'pe_build/config_builder/pe_bootstrap'
-    require 'pe_build/config_builder/pe_agent'
+    require_relative 'config_builder/global'
   end
 end
+
+if ConfigBuilder::VERSION > '1.0'
+  require_relative 'config_builder/1_x'
+else
+  require_relative 'config_builder/0_x'
+end

data/lib/pe_build/config_builder/0_x.rb

@@ -0,0 +1,6 @@
+module PEBuild
+  module ConfigBuilder
+    require_relative '0_x/pe_bootstrap'
+    require_relative '0_x/pe_agent'
+  end
+end

data/lib/pe_build/config_builder/{pe_bootstrap.rb → 0_x/pe_bootstrap.rb}

@@ -56,6 +56,7 @@ class PEBuild::ConfigBuilder::PEBootstrap < ::PEBuild::ConfigBuilder::Global
         with_attr(:series)        { |val| pe.series        = val }
         with_attr(:suffix)        { |val| pe.suffix        = val }
         with_attr(:filename)      { |val| pe.filename      = val }
+        with_attr(:shared_installer) { |val| pe.shared_installer = val }
 
         with_attr(:role)               { |val| pe.role               = val }
         with_attr(:verbose)            { |val| pe.verbose            = val }

data/lib/pe_build/config_builder/1_x.rb

@@ -0,0 +1,6 @@
+module PEBuild
+  module ConfigBuilder
+    require_relative '1_x/pe_bootstrap'
+    require_relative '1_x/pe_agent'
+  end
+end

data/lib/pe_build/config_builder/1_x/pe_agent.rb

@@ -0,0 +1,35 @@
+require 'config_builder/model'
+
+# @since 0.13.0
+class PEBuild::ConfigBuilder::PEAgent < ::ConfigBuilder::Model::Provisioner::Base
+  # @!attribute [rw] autosign
+  #   If true, and {#master_vm} is set, the agent's certificate will be signed
+  #   on the master VM.
+  #
+  #   @return [true, false] Defaults to `true` if {#master_vm} is set,
+  #     otherwise `false`.
+  def_model_attribute :autosign
+  # @!attribute [rw] autopurge
+  #   If true, and {#master_vm} is set, the agent's certificate and data will
+  #   be purged from the master VM if the agent is destroyed by Vagrant.
+  #
+  #   @return [true, false] Defaults to `true` if {#master_vm} is set,
+  #     otherwise `false`.
+  def_model_attribute :autopurge
+  # @!attribute master
+  #   @return [String] The DNS hostname of the Puppet master for this node.
+  #     If {#master_vm} is set, the hostname of that machine will be used
+  #     as a default. If the hostname is unset, the name of the VM will be
+  #     used as a secondary default.
+  def_model_attribute :master
+  # @!attribute master_vm
+  #   @return [String] The name of a Vagrant VM to use as the master.
+  def_model_attribute :master_vm
+  # @!attribute version
+  #   @return [String] The version of PE to install. May be either a version
+  #   string of the form `x.y.x[-optional-arbitrary-stuff]` or the string
+  #   `current`. Defaults to `current`.
+  def_model_attribute :version
+
+  ::ConfigBuilder::Model::Provisioner.register('pe_agent', self)
+end

data/lib/pe_build/config_builder/1_x/pe_bootstrap.rb

@@ -0,0 +1,91 @@
+require 'config_builder/model'
+
+class PEBuild::ConfigBuilder::PEBootstrap < ::ConfigBuilder::Model::Provisioner::Base
+
+  # @!attribute [rw] version
+  #   @return [String] The version of Puppet Enterprise to install.
+  def_model_attribute :version
+
+  # @!attribute [rw] version_file
+  #   @return [String] The path to a file relative to {#download_root}. The
+  #     contents of this file will be read and used to specify {#version}.
+  #   @since 0.9.0
+  def_model_attribute :version_file
+
+  # @!attribute [rw] series
+  #   @return [String] The release series of PE. Completely optional and
+  #     currently has no effect other than being an interpolation token
+  #     available for use in {#download_root}.
+  #
+  #   @since 0.9.0
+  def_model_attribute :series
+
+  # @!attribute [rw] suffix
+  #   @return [String] The distribution specifix suffix of the Puppet
+  #     Enterprise installer to use.
+  def_model_attribute :suffix
+
+  # @!attribute [rw] filename
+  #   @return [String] The filename of the Puppet Enterprise installer.
+  def_model_attribute :filename
+
+  # @!attribute [rw] download_root
+  #   @return [String] The URI to the directory containing Puppet Enterprise
+  #     installers if the installer is not yet cached. This setting is optional.
+  def_model_attribute :download_root
+
+  # @!attribute shared_installer
+  #   @return [Boolean] Whether to run PE installation using installers and
+  #     answers shared using the `/vagrant` mount. If set to `false`, resources
+  #     will be downloaded remotely to the home directory of whichever user
+  #     account Vagrant is using. Defaults to `true`.
+  #
+  #   @since 0.14.0
+  def_model_attribute :shared_installer
+
+  # @!attribute [rw] role
+  #   @return [Symbol] The role of the Puppet Enterprise install.
+  def_model_attribute :role
+
+  # @!attribute [rw] verbose
+  #   @return [Boolean] Whether or not to show the verbose output of the Puppet
+  #     Enterprise install.
+  def_model_attribute :verbose
+
+  # @!attribute [rw] master
+  #   @return [String] The address of the puppet master.
+  def_model_attribute :master
+
+  # @!attribute [rw] answer_file
+  #   @return [String] The location of alternate answer file for PE
+  #     installation. Values can be paths relative to the Vagrantfile's project
+  #     directory.
+  def_model_attribute :answer_file
+
+  # @!attribute answer_extras
+  #   @return [Array<String>] An array of additional answer strings that will
+  #     be appended to the answer file. (Optional)
+  #   @since 0.11.0
+  def_model_attribute :answer_extras
+
+  # @!attribute [rw] relocate_manifests
+  #   @return [Boolean] Whether or not to change the PE master to use a config
+  #     of manifestdir=/manifests and modulepath=/modules. This is meant to be
+  #     used when the vagrant working directory manifests and modules are
+  #     remounted on the guest.
+  def_model_attribute :relocate_manifests
+
+  # @!attribute [rw] autosign
+  #   Configure the certificates that will be autosigned by the puppet master.
+  #
+  #   @return [TrueClass] All CSRs will be signed
+  #   @return [FalseClass] The autosign config file will be unmanaged
+  #   @return [Array<String>] CSRs with the given addresses
+  #
+  #   @see http://docs.puppetlabs.com/guides/configuring.html#autosignconf
+  #
+  #   @since 0.4.0
+  def_model_attribute :autosign
+
+  ::ConfigBuilder::Model::Provisioner.register('pe_bootstrap', self)
+end

data/lib/pe_build/config_builder/global.rb

@@ -34,6 +34,15 @@ class PEBuild::ConfigBuilder::Global < ::ConfigBuilder::Model::Base
   #     installers if the installer is not yet cached. This setting is optional.
   def_model_attribute :download_root
 
+  # @!attribute shared_installer
+  #   @return [Boolean] Whether to run PE installation using installers and
+  #     answers shared using the `/vagrant` mount. If set to `false`, resources
+  #     will be downloaded remotely to the home directory of whichever user
+  #     account Vagrant is using. Defaults to `true`.
+  #
+  #   @since 0.14.0
+  def_model_attribute :shared_installer
+
   def to_proc
     Proc.new do |global_config|
       with_attr(:download_root) { |val| global_config.pe_build.download_root = val }
@@ -42,6 +51,7 @@ class PEBuild::ConfigBuilder::Global < ::ConfigBuilder::Model::Base
       with_attr(:series)        { |val| global_config.pe_build.series        = val }
       with_attr(:suffix)        { |val| global_config.pe_build.suffix        = val }
       with_attr(:filename)      { |val| global_config.pe_build.filename      = val }
+      with_attr(:shared_installer) { |val| global_config.pe_build.shared_installer = val }
     end
   end
 end

data/lib/pe_build/plugin.rb

@@ -85,6 +85,24 @@ module PEBuild
 
     ## Run install
 
+    guest_capability('linux', 'stage_installer') do
+      require_relative 'cap'
+      PEBuild::Cap::StageInstaller::POSIX
+    end
+
+    [:solaris, :solaris11].each do |os|
+      guest_capability(os, 'stage_installer') do
+        require_relative 'cap'
+        PEBuild::Cap::StageInstaller::POSIX
+      end
+    end
+
+    guest_capability('windows', 'stage_installer') do
+      require_relative 'cap'
+      PEBuild::Cap::StageInstaller::Windows
+    end
+
+
     guest_capability('linux', 'run_install') do
       require_relative 'cap'
       PEBuild::Cap::RunInstall::POSIX

data/lib/pe_build/provisioner/pe_agent.rb

@@ -1,6 +1,8 @@
 require 'pe_build/util/pe_packaging'
 require 'pe_build/util/machine_comms'
 
+require 'uri'
+
 module PEBuild
   module Provisioner
     # Provision PE agents using simplified install
@@ -17,9 +19,9 @@ module PEBuild
       def provision
         provision_init!
 
-        # As of 2015.x, pe_repo doesn't support windows installation, so skip
-        # provisioning the repositories.
-        unless master_vm.nil? || provision_windows?
+        # NOTE: When enabling installation for PE 3.x, Windows isn't supported
+        # by that build of pe_repo.
+        unless master_vm.nil?
           provision_pe_repo
         end
         provision_agent
@@ -164,19 +166,20 @@ bash pe_frictionless_installer.sh
       #
       # Executes a `pe_bootstrap` provisioner running in agent mode.
       def provision_windows_agent
-        pe_config = ::PEBuild::Config::PEBootstrap.new
-        pe_config.role    = :agent
-        # Windows won't reconize 'current' as a version number, so fall through
-        # to the global default by leaving it unset.
-        pe_config.version = config.version unless config.version == 'current'
-        pe_config.master  = config.master
-        pe_config.finalize!
-
-        machine.ui.info "Installing Windows agent with PE Bootstrap"
-
-        pe_provisioner = Vagrant.plugin('2').manager.provisioners[:pe_bootstrap].new(machine, pe_config)
-        pe_provisioner.configure(machine.config)
-        pe_provisioner.provision
+        platform_tag = platform_tag(facts)
+        installer = "puppet-agent-#{facts['architecture']}.msi"
+        # TODO: Extend to allow passing arbitrary install options.
+        answers = {
+          'PUPPET_MASTER_SERVER'  => config.master,
+          'PUPPET_AGENT_CERTNAME' => machine.name,
+        }
+
+        # TODO: Extend to use `config.version` once {#provision_pe_repo}
+        # supports it.
+        installer_url = URI.parse("https://#{config.master}:8140/packages/current/#{platform_tag}/#{installer}")
+
+        machine.guest.capability(:stage_installer, installer_url, '.')
+        machine.guest.capability(:run_install, installer, answers)
       end
 
       def provision_agent_cert

data/lib/pe_build/provisioner/pe_bootstrap.rb

@@ -53,19 +53,35 @@ module PEBuild
           FileUtils.mkdir_p work_dir
         end
       end
-
       def provision
-        prepare_answers_file
         load_archive
-        fetch_installer
-
-        @machine.guest.capability('run_install', @config, @archive)
 
-        run_postinstall_tasks
+        if pe_installed?
+          machine.ui.warn I18n.t('pebuild.provisioner.pe_bootstrap.already_installed'),
+                          :name  => machine.name
+        else
+          prepare_answers_file
+          fetch_installer
+          run_install
+          run_postinstall_tasks
+        end
       end
 
       private
 
+      def pe_installed?
+        case machine.guest.capability_host_chain.first.first
+        when :windows
+          gt_win2k3_path = '${Env:ALLUSERSPROFILE}\\PuppetLabs'
+          le_win2k3_path = '${Env:ALLUSERSPROFILE}\\Application Data\\PuppetLabs'
+          testpath = "(Test-Path \"#{gt_win2k3_path}\") -or (Test-Path \"#{le_win2k3_path}\")"
+
+          machine.communicate.test("If (#{testpath}) { Exit 0 } Else { Exit 1 }")
+        else
+          machine.communicate.test('test -f /opt/puppet/pe_version || test -f /opt/puppetlabs/server/pe_version')
+        end
+      end
+
       def late_config_merge(root_config)
         provision = @config
         global    = root_config.pe_build
@@ -85,6 +101,10 @@ module PEBuild
       def prepare_answers_file
         af = AnswersFile.new(@machine, @config, @work_dir)
         af.generate
+
+        unless @config.shared_installer
+          @machine.communicate.upload(File.join(@answer_dir, "#{@machine.name}.txt"), "#{machine.name}.txt")
+        end
       end
 
       def load_archive
@@ -115,9 +135,44 @@ module PEBuild
 
       # @todo panic if @config.download_root is undefined
       def fetch_installer
-        uri = @config.download_root
-        @archive.fetch(@config.download_root)
-        @archive.unpack_to(@work_dir)
+        if @config.shared_installer
+          uri = @config.download_root
+          @archive.fetch(@config.download_root)
+          @archive.unpack_to(@work_dir)
+        else
+          @machine.guest.capability(:stage_installer, @archive.source_uri(@config.download_root), '.')
+        end
+      end
+
+      def run_install
+        case machine.guest.capability_host_chain.first.first
+        when :windows
+          if @config.shared_installer
+            drive = machine.communicate.shell.cmd('ECHO %SYSTEMDRIVE%')[:data][0][:stdout].chomp
+            installer_dir = File.join(drive, 'vagrant', PEBuild::WORK_DIR)
+
+            installer_path = File.join(installer_dir, @archive.filename)
+          else
+            installer_path = @archive.filename
+          end
+
+          # Windows installations don't use answer files.
+          answers = {
+            'PUPPET_MASTER_SERVER'  => @config.master,
+            'PUPPET_AGENT_CERTNAME' => machine.name,
+          }
+        else
+          if @config.shared_installer
+            root = File.join('/vagrant', PEBuild::WORK_DIR)
+            installer_path = File.join(root, @archive.installer_dir, 'puppet-enterprise-installer')
+            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")
+          end
+        end
+
+        machine.guest.capability('run_install', installer_path, answers)
       end
 
       def run_postinstall_tasks

data/lib/pe_build/provisioner/pe_bootstrap/post_install.rb

@@ -41,7 +41,12 @@ class PEBuild::Provisioner::PEBootstrap::PostInstall
         puppet_apply  = "/opt/puppetlabs/bin/puppet apply"
       end
 
-      manifest_path = "/vagrant/.pe_build/post-install/#{@machine.name}.pp"
+      if @config.shared_installer
+        manifest_path = "/vagrant/.pe_build/post-install/#{@machine.name}.pp"
+      else
+        @machine.communicate.upload(@post_install_manifest, "#{@machine.name}.pp")
+        manifest_path = "#{@machine.name}.pp"
+      end
 
       on_machine(@machine, "#{puppet_apply} #{manifest_path}")
     end

data/lib/pe_build/release.rb

@@ -39,7 +39,8 @@ module PEBuild
     require 'pe_build/release/3_8'
     require 'pe_build/release/2015_2'
     require 'pe_build/release/2015_3'
+    require 'pe_build/release/2016_1'
 
-    LATEST_VERSION = '2015.3.0'
+    LATEST_VERSION = '2015.3.3'
   end
 end

data/lib/pe_build/release/2015_3.rb

@@ -16,10 +16,6 @@ module PEBuild::Release
     add_release :ubuntu, '12.04'
     add_release :ubuntu, '14.04'
 
-    # Nothing has changed for installation of Windows agents.
-
-    add_release :windows, '2003'
-    add_release :windows, '2003R2'
     add_release :windows, '2008'
     add_release :windows, '2008R2'
     add_release :windows, '7'
@@ -35,4 +31,5 @@ module PEBuild::Release
   @releases['2015.3.0'] = twentyfifteen_three_x
   @releases['2015.3.1'] = twentyfifteen_three_x
   @releases['2015.3.2'] = twentyfifteen_three_x
+  @releases['2015.3.3'] = twentyfifteen_three_x
 end

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

@@ -0,0 +1,29 @@
+require 'pe_build/release'
+
+module PEBuild::Release
+
+  twentyfifteen_six_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 :windows, '2008'
+    add_release :windows, '2008R2'
+    add_release :windows, '7'
+    add_release :windows, '2012'
+    add_release :windows, '2012R2'
+    add_release :windows, '8'
+    add_release :windows, '8.1'
+
+    set_answer_file :master, File.join(PEBuild.template_dir, 'answers', 'master-2015.x.txt.erb')
+    set_answer_file :agent,  File.join(PEBuild.template_dir, 'answers', 'agent-2015.x.txt.erb')
+  end
+
+  @releases['2016.1.0'] = twentyfifteen_six_x
+end

data/lib/pe_build/util/pe_packaging.rb

@@ -26,6 +26,7 @@ module PEBuild
           arch    = facts['architecture']
         when 'windows'
           os      = 'windows'
+          # Windows packages don't discriminate based on version.
           version = nil
           arch    = (facts['architecture'] == 'x64' ? 'x86_64' : 'i386')
         when 'debian'
@@ -48,7 +49,7 @@ module PEBuild
         end
         # TODO: Add "unknown os" error.
 
-        [os, version, arch].join('-').downcase
+        [os, version, arch].compact.join('-').downcase
       end
       module_function :platform_tag
 

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.13.7'
+  VERSION = '0.14.0'
 end

data/spec/unit/provisioner/pe_agent_spec.rb

@@ -78,12 +78,10 @@ EOF
     context 'when osfamily is windows' do
       before(:each) do
         allow(subject).to receive(:provision_windows?).and_return(true)
-        allow(subject).to receive(:master_vm).and_return(master_vm)
       end
 
-      it 'invokes the windows provisioner and skips pe_repo' do
+      it 'invokes the windows provisioner' do
         expect(subject).to receive(:provision_windows_agent)
-        expect(subject).to receive(:provision_pe_repo).never
 
         subject.provision
       end

data/templates/locales/en.yml

@@ -28,6 +28,8 @@ en:
       pe_bootstrap:
         post_install: |-
           Applying post-install configuration to Puppet Enterprise.
+        already_installed: |-
+          Puppet Enterprise is already installed, skipping installation.
         errors:
           unset_version: |-
             The Puppet Enterprise version must be set either on the global pe_build config
@@ -114,9 +116,11 @@ en:
             The agent version %{version} is too old; pe_agent can only provision versions
             newer than %{minimum_version}.
     cap:
+      stage_installer:
+        downloading_installer: |-
+          Downloading PE installer from:
+            %{url}
       run_install:
-        already_installed: |-
-          Puppet Enterprise is already installed, skipping installation.
         scheduling_run: |-
           Scheduling Puppet run to kickstart node classification.
       detect_installer:

data/vagrant-pe_build.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |gem|
 
   gem.license = 'Apache 2.0'
 
-  gem.add_runtime_dependency 'progressbar'
-  gem.add_runtime_dependency 'minitar'
+  gem.add_runtime_dependency 'progressbar', '~> 0.21.0'
+  gem.add_runtime_dependency 'minitar', '~> 0.5.4'
 
-  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rake', '~> 10.0'
   # Pin to 2.14.x for compatibility with vagrant-spec.
   gem.add_development_dependency 'rspec', '~> 2.14.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.13.7
+  version: 0.14.0
 platform: ruby
 authors:
 - Adrien Thebo
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 description: 
@@ -75,10 +75,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -120,6 +120,8 @@ files:
 - lib/pe_build/cap/facts/windows.rb
 - lib/pe_build/cap/run_install/posix.rb
 - lib/pe_build/cap/run_install/windows.rb
+- lib/pe_build/cap/stage_installer/posix.rb
+- lib/pe_build/cap/stage_installer/windows.rb
 - lib/pe_build/command.rb
 - lib/pe_build/command/base.rb
 - lib/pe_build/command/copy.rb
@@ -130,9 +132,13 @@ files:
 - lib/pe_build/config/pe_agent.rb
 - lib/pe_build/config/pe_bootstrap.rb
 - lib/pe_build/config_builder.rb
+- lib/pe_build/config_builder/0_x.rb
+- lib/pe_build/config_builder/0_x/pe_agent.rb
+- lib/pe_build/config_builder/0_x/pe_bootstrap.rb
+- lib/pe_build/config_builder/1_x.rb
+- lib/pe_build/config_builder/1_x/pe_agent.rb
+- lib/pe_build/config_builder/1_x/pe_bootstrap.rb
 - lib/pe_build/config_builder/global.rb
-- lib/pe_build/config_builder/pe_agent.rb
-- lib/pe_build/config_builder/pe_bootstrap.rb
 - lib/pe_build/config_default.rb
 - lib/pe_build/idempotent.rb
 - lib/pe_build/on_machine.rb
@@ -145,6 +151,7 @@ files:
 - lib/pe_build/release/1_2.rb
 - lib/pe_build/release/2015_2.rb
 - lib/pe_build/release/2015_3.rb
+- lib/pe_build/release/2016_1.rb
 - lib/pe_build/release/2_0.rb
 - lib/pe_build/release/2_5.rb
 - lib/pe_build/release/2_6.rb
@@ -204,17 +211,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Vagrant provisioners for installing Puppet Enterprise