vagrant-pe_build 0.17.14 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a94374dc836503e946fe00c1f830721f446b901
-  data.tar.gz: 9f243b38ee63f662a16abb1f8c90995b564ec0ab
+  metadata.gz: 722fdb02b3003ab773830539fa6846489578b6c4
+  data.tar.gz: 4ced1f298690ee009cb4906440456d29999029f2
 SHA512:
-  metadata.gz: ecd35c58357c9d43ec8e953ae6864a23e962cedc5682367b0f92ccec42bc1e2d4f0fa8cbc2ecf42ab2722f6cca2f9844a211ae869e3f16b9d284151385af03ce
-  data.tar.gz: e791545b660b953b09cc6f98ad90e9c7ccf8649011854a2d9ad9310ea972a53c7b477bf53d48516d6eb0465789d295c0410a25b15362ce9833e5c90c4e38bcdd
+  metadata.gz: 21b4e98244a6403adc280d8d5c8b78876850806d77755b10759bc4e1686b32aa17b9f10fea25ca68db251943f4ffd22133de8500f71cf49d122016b5c049eb27
+  data.tar.gz: 8b5f65c5f9086276cc805ae97524d7439e9cbf9907766518aaf1515029e0cc87222334a13cc833b795a0ef722d8dcb9e69b71c9d62a984494e4610fdbf6e1dc0

data/.travis.yml

@@ -29,6 +29,6 @@ matrix:
     - rvm: 2.4.4
       env: TEST_VAGRANT_VERSION=v2.0.4 BUNDLER_VERSION=1.16.1
     - rvm: 2.4.4
-      env: TEST_VAGRANT_VERSION=v2.1.2 BUNDLER_VERSION=1.16.1
+      env: TEST_VAGRANT_VERSION=v2.1.5 BUNDLER_VERSION=1.16.1
     - rvm: 2.4.4
       env: TEST_VAGRANT_VERSION=HEAD BUNDLER_VERSION=1.16.1

data/CHANGELOG

@@ -1,6 +1,25 @@
 vagrant-pe_build
 ================
 
+0.18.0
+------
+
+2018-10-10
+
+This is a backwards compatible feature release.
+
+  * Add support for signing and purging agent certificates with Puppet 6
+    CA commands.
+
+  * Add support for two new agent types, "replica" and "compile", which can
+    be used to provision PE HA replicas and compilers.
+
+  * Add support for 2019.0.0
+
+Huge thanks to Jarret Lavallee for contributing Puppet 6 CA support along
+with the replica and compile agent roles.
+
+
 0.17.14
 -------
 

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 require 'rubygems/version'
 
-vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v2.1.2'
+vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v2.1.5'
 vagrant_version = nil
 
 # Wrapping gemspec in the :plugins group causes Vagrant 1.5 and newer to

data/README.markdown

@@ -11,6 +11,64 @@ Synopsis
 `vagrant-pe_build` manages the downloading and installation of Puppet Enterprise
 on Vagrant boxes to rapidly build a functioning Puppet environment.
 
+Quickstart
+---------------
+
+Note: This project is part of a larger suite of tools. For an easier
+way to build a PE infrastructure with Vagrant, check out the parent
+project: https://github.com/oscar-stack/oscar
+This documentation should be used when you're using this plugin alone.
+
+To use this Vagrant plugin, you must first have a working Vagrant setup.
+The examples below assume you're using Virtualbox for virtualization. If
+you're using another virtualization system, you will have to make
+adjustments to your `Vagrantfile`.
+
+Install the plugin by typing: `vagrant plugin install vagrant-pe_build`
+
+Next, you'll need to manaually download the version of Puppet
+Enterprise you would like to use. At the time of writing, the latest
+version is 2018.1.3. https://puppet.com/download-puppet-enterprise
+(Make sure to download the version for CentOS 7.)
+
+Once that is finished downloading, copy it into a `pe_build` staging
+area (defaults to `~/.vagrant/pe_builds`) by running this command:
+`vagrant pe-build copy puppet-enterprise-2018.1.3-el-7-x86_64.tar.gz`
+
+Then create a Vagrantfile that looks like this:
+
+```ruby
+Vagrant.configure('2') do |config|
+  config.pe_build.version = '2018.1.3'
+
+  config.vm.define 'master' do |node|
+    node.vm.hostname = 'master.localdomain'
+    node.vm.box = 'puppetlabs/centos-7.2-64-nocm'
+
+    node.vm.provision :pe_bootstrap do |p|
+      p.role = :master
+    end
+  end
+
+  config.vm.define 'agent' do |node|
+    node.vm.box = 'puppetlabs/centos-7.2-64-nocm'
+    node.vm.provision "shell", inline: "echo < YOUR MASTER IP > master.localdomain master | sudo tee -a /etc/hosts"
+    node.vm.provision :pe_agent do |p|
+      p.master_vm = 'master.localdomain'
+    end
+  end
+end
+```
+
+And then run `vagrant up master` and after PE is installed, you'll
+need to manually discover the master's IP and add it to the Vagrantfile.
+
+To do this, type `vagrant ssh master` and then type `ip addr` and copy the
+IP, and paste it into the command for the shell provisioner on the agent.
+
+Finally, to create the agent type `vagrant up agent`. This entire process
+is much easier if you use the parent project: https://github.com/oscar-stack/oscar
+
 Vagrantfile Settings
 -------------------
 
@@ -132,38 +190,16 @@ with the global `config.pe_build` settings.
       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'`.
+  * `agent_type`
+      * Description: The type of agent to provision. This can be set to a agent, compile master, or an HA replica. Some automations are built in to configure the specified agent type on the primary master. Possible values are `'agent'`, `'replica'`, `'compile'`
+      * Default: `'agent'`.
 
 
 Commands
 --------
 
-Usage Example
--------------
-
-### Minimal PE 3.x configuration
-
-This requires that the necessary installers have already been downloaded and
-added with `vagrant pe-build copy`.
-
-```ruby
-Vagrant.configure('2') do |config|
-  config.pe_build.version = '3.8.4'
-
-  config.vm.define 'master' do |node|
-    node.vm.box = 'puppetlabs/centos-7.2-64-nocm'
-
-    node.vm.provision :pe_bootstrap do |p|
-      p.role = :master
-    end
-  end
-
-  config.vm.define 'agent1' do |node|
-    node.vm.box = 'puppetlabs/centos-7.2-64-nocm'
-    node.vm.provision :pe_bootstrap
-  end
-end
-```
-
+Other Usage Examples
+--------------------
 
 ### Minimal PE 2015.x configuration
 
@@ -290,6 +326,3 @@ Contact
 
   * [Source code](https://github.com/oscar-stack/vagrant-pe_build)
   * [Issue tracker](https://github.com/oscar-stack/vagrant-pe_build/issues)
-
-If you have questions or concerns about this module, contact finch on on
-Freenode, or email adrien@puppetlabs.com.

data/lib/pe_build/action/version_check.rb

@@ -3,7 +3,7 @@ require 'rubygems/version'
 
 # Check for deprecated Vagrant versions
 class PEBuild::Action::VersionCheck
-  MINIMUM_VERSION = '1.8.0'
+  MINIMUM_VERSION = '2.0.0'
 
   def initialize(app, env)
     @app = app

data/lib/pe_build/config/pe_agent.rb

@@ -40,12 +40,20 @@ class PEBuild::Config::PEAgent < Vagrant.plugin('2', :config)
   #   `current`. Defaults to `current`.
   attr_accessor :version
 
+  # @!attribute agent_type
+  #   @return [String] The type of agent installation this will be. 
+  #   This allows for configuring the agent as an infrastructure component.
+  #   May be either `compile`, `replica, or `agent`.
+  #   Defaults to `agent`.
+  attr_accessor :agent_type
+
   def initialize
     @autosign      = UNSET_VALUE
     @autopurge     = UNSET_VALUE
     @master        = UNSET_VALUE
     @master_vm     = UNSET_VALUE
     @version       = UNSET_VALUE
+    @agent_type    = UNSET_VALUE
   end
 
   def finalize!
@@ -54,6 +62,7 @@ class PEBuild::Config::PEAgent < Vagrant.plugin('2', :config)
     @autosign      = (not @master_vm.nil?) if @autosign  == UNSET_VALUE
     @autopurge     = (not @master_vm.nil?) if @autopurge == UNSET_VALUE
     @version       = 'current' if @version == UNSET_VALUE
+    @agent_type    = 'agent' if @agent_type == UNSET_VALUE
   end
 
   def validate(machine)
@@ -65,6 +74,7 @@ class PEBuild::Config::PEAgent < Vagrant.plugin('2', :config)
 
     validate_master_vm!(errors, machine)
     validate_version!(errors, machine)
+    validate_agent_type!(errors, machine)
 
     {'pe_agent provisioner' => errors}
   end
@@ -120,4 +130,32 @@ class PEBuild::Config::PEAgent < Vagrant.plugin('2', :config)
       :version_class => @version.class
     )
   end
+
+  def validate_agent_type!(errors, machine)
+
+      unless ['agent','replica','compile'].include?(@agent_type)
+        errors << I18n.t(
+          'pebuild.config.pe_agent.errors.agent_type_invalid',
+          :type         => @agent_type,
+        )
+      end
+
+      if @agent_type == 'replica' and PEBuild::Util::VersionString.compare(@version, '2016.5.0') < 0
+        errors << I18n.t(
+          'pebuild.config.pe_agent.errors.agent_type_version_too_old',
+          :version         => @version,
+          :minimum_version => '2016.5.0',
+          :agent_type      => @agent_type
+        )
+      elsif @agent_type == 'compile' and PEBuild::Util::VersionString.compare(@version, '2016.1.0') < 0
+        errors << I18n.t(
+          'pebuild.config.pe_agent.errors.agent_type_version_too_old',
+          :version         => @version,
+          :minimum_version => '2016.1.0',
+          :agent_type      => @agent_type
+        )
+      end
+
+      return
+  end
 end

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

@@ -30,6 +30,12 @@ class PEBuild::ConfigBuilder::PEAgent < ::ConfigBuilder::Model::Provisioner::Bas
   #   string of the form `x.y.x[-optional-arbitrary-stuff]` or the string
   #   `current`. Defaults to `current`.
   def_model_attribute :version
+  # @!attribute agent_type
+  #   @return [String] The type of agent installation this will be.
+  #   This allows for configuring the agent as an infrastructure component.
+  #   May be either `compile`, `replica, or `agent`.
+  #   Defaults to `agent`.
+  def_model_attribute :agent_type
 
   ::ConfigBuilder::Model::Provisioner.register('pe_agent', self)
 end

data/lib/pe_build/provisioner/pe_agent.rb

@@ -28,6 +28,7 @@ module PEBuild
         end
         provision_agent
         provision_agent_cert if config.autosign
+        provision_agent_type unless config.agent_type == 'agent'
       end
 
       # This gets run during agent destruction and will remove the agent's
@@ -46,6 +47,7 @@ module PEBuild
         @master_vm = machine.env.machine(*vm_def)
 
         cleanup_agent_cert if config.autopurge
+        cleanup_agent_type unless config.agent_type == 'agent'
       end
 
       private
@@ -195,7 +197,10 @@ bash pe_frictionless_installer.sh
         # inverted as `grep -q` will exit with 1 if the certificate is not
         # found.
         # TODO: Extend paths to PE 3.x masters.
-        if not master_vm.communicate.test("/opt/puppetlabs/bin/puppet cert list | grep -q -F #{agent_certname}", :sudo => true)
+        csr_check = PEBuild::Util::VersionString.compare(config.version, '2019.0.0') < 0 ?
+            "/opt/puppetlabs/bin/puppet cert list | grep -q -F #{agent_certname}" :
+            "/opt/puppetlabs/bin/puppetserver ca list | grep -q -F #{agent_certname}"
+        if not master_vm.communicate.test(csr_check, :sudo => true)
           master_vm.ui.info I18n.t(
             'pebuild.provisioner.pe_agent.no_csr_pending',
             :certname => agent_certname,
@@ -210,16 +215,13 @@ bash pe_frictionless_installer.sh
           :master   => master_vm.name.to_s
         )
 
-        shell_config = Vagrant.plugin('2').manager.provisioner_configs[:shell].new
-        shell_config.privileged = true
         # TODO: Extend paths to PE 3.x masters.
-        shell_config.inline = <<-EOS
-/opt/puppetlabs/bin/puppet cert --allow-dns-alt-names sign #{agent_certname}
-        EOS
-        shell_config.finalize!
+        # NOTE: 2019.0.0 has Cert SAN allowed by default
+        sign_cert = PEBuild::Util::VersionString.compare(config.version, '2019.0.0') < 0 ?
+            "/opt/puppetlabs/bin/puppet cert --allow-dns-alt-names sign #{agent_certname}" :
+            "/opt/puppetlabs/bin/puppetserver ca sign --certname #{agent_certname}"
+        shell_provision_commands(master_vm, sign_cert)
 
-        shell_provisioner = Vagrant.plugin('2').manager.provisioners[:shell].new(master_vm, shell_config)
-        shell_provisioner.provision
       end
 
       def cleanup_agent_cert
@@ -236,7 +238,11 @@ bash pe_frictionless_installer.sh
         end
 
         # TODO: Extend paths to PE 3.x masters.
-        unless master_vm.communicate.test("/opt/puppetlabs/bin/puppet cert list #{agent_certname}", :sudo => true)
+        # TODO: Find a way to query an individual certificate through puppetserver ca.
+        cert_check = PEBuild::Util::VersionString.compare(config.version, '2019.0.0') < 0 ?
+            "/opt/puppetlabs/bin/puppet cert list #{agent_certname}" :
+            "/opt/puppetlabs/bin/puppetserver ca list --all| grep -q -F #{agent_certname}"
+        unless master_vm.communicate.test(cert_check, :sudo => true)
           master_vm.ui.info I18n.t(
             'pebuild.provisioner.pe_agent.agent_purged',
             :certname => agent_certname,
@@ -274,6 +280,195 @@ bash pe_frictionless_installer.sh
         end
       end
 
+      # Run shell provision commands on a target machine
+      # commands is expected to be an array
+      def shell_provision_commands(target_machine, commands)
+
+        shell_config = Vagrant.plugin('2').manager.provisioner_configs[:shell].new
+        shell_config.privileged = true
+        shell_config.inline = [commands].flatten.join("\n")
+        shell_config.finalize!
+
+        target_machine.ui.info "Running: #{shell_config.inline}"
+
+        shell_provisioner = Vagrant.plugin('2').manager.provisioners[:shell].new(target_machine, shell_config)
+        shell_provisioner.provision
+
+      end
+
+      # Run commands on the master_vm based on the agent_type
+      # Allows for provisioning replcas and compile masters
+      def provision_agent_type
+        ensure_reachable(master_vm)
+
+        agent_certname = facts['certname']
+
+        # Return if the certname is in the infrastructure status
+        if master_vm.communicate.test("/opt/puppetlabs/bin/puppet infrastructure status --host #{agent_certname} --verbose | grep -q -F #{agent_certname}", :sudo => true)
+          master_vm.ui.info I18n.t(
+            'pebuild.provisioner.pe_agent.agent_type_provisioned',
+            :certname => agent_certname,
+            :master   => master_vm.name.to_s,
+            :type     => config.agent_type
+          )
+          return
+        end
+
+        case config.agent_type
+          when 'replica'
+            provision_replica
+          when 'compile'
+            provision_compile
+          else
+            machine.ui.error I18n.t(
+              'pebuild.provisioner.pe_agent.agent_type_invalid',
+              :type => config.agent_type
+            )
+            return
+          end
+      end
+
+      def provision_replica
+        # Provision an HA replica
+        agent_certname = facts['certname']
+
+        # Check for code manager and run the puppet agent on the master if it is not running.
+        unless master_vm.communicate.test("/opt/puppetlabs/bin/puppet infrastructure status --verbose | grep -q -F 'Code Manager'", :sudo => true)
+          shell_provision_commands(master_vm, ['/opt/puppetlabs/bin/puppet agent -t || true', '/opt/puppetlabs/bin/puppet agent -t || true'])
+
+          # Try to check for code manager again
+          unless master_vm.communicate.test("/opt/puppetlabs/bin/puppet infrastructure status --verbose | grep -q -F 'Code Manager'", :sudo => true)
+            master_vm.ui.error I18n.t(
+              'pebuild.provisioner.pe_agent.code_manager_not_running',
+              :certname => agent_certname,
+              :master   => master_vm.name.to_s,
+              :type     => config.agent_type
+            )
+            return
+          end
+        end
+
+        master_vm.ui.info I18n.t(
+          'pebuild.provisioner.pe_agent.provisioning_type',
+          :certname => agent_certname,
+          :master   => master_vm.name.to_s,
+          :type     => config.agent_type
+        )
+
+        # Run the agent on the machine to ensure it is configured, has a report in puppetdb, and pxp-agent is running
+        shell_provision_commands(machine, '/opt/puppetlabs/bin/puppet agent -t || true')
+
+        # Install an RBAC token
+        # Deploy code to ensure it has been done
+        # Provision the replica
+        shell_provision_commands(master_vm, ['set -e',
+                                             'echo "puppetlabs" | /opt/puppetlabs/bin/puppet access login --username admin -l 0',
+                                             '/opt/puppetlabs/bin/puppet code deploy --all --wait',
+                                             "/opt/puppetlabs/bin/puppet infrastructure provision replica #{agent_certname}",
+                                             "/opt/puppetlabs/bin/puppet infrastructure enable replica --yes --topology mono #{agent_certname}"
+                                             ])
+      end
+
+      def provision_compile
+        # Provision a compile master
+        agent_certname = facts['certname']
+
+        master_vm.ui.info I18n.t(
+          'pebuild.provisioner.pe_agent.provisioning_type',
+          :certname => agent_certname,
+          :master   => master_vm.name.to_s,
+          :type     => config.agent_type
+        )
+
+        # Pin the node to the PE Master group
+        shell_provision_commands(master_vm, ['set -e',
+                                             "CLASSIFIER=$(grep server /etc/puppetlabs/puppet/classifier.yaml | grep -Eo '([^ ]+)$')",
+                                             "CERT_ARGS=\"--cert $(/opt/puppetlabs/bin/puppet config print hostcert)\
+                                               --key $(/opt/puppetlabs/bin/puppet config print hostprivkey)\
+                                               --cacert $(/opt/puppetlabs/bin/puppet config print localcacert)\"",
+                                             "PARSE_ID_RUBY=\"require 'json'; puts JSON.parse(ARGF.read).find{ |group| group['name'] == 'PE Master' }['id']\"",
+                                             "ID=$(curl -sS -k $CERT_ARGS https://$CLASSIFIER:4433/classifier-api/v1/groups |\
+                                               /opt/puppetlabs/puppet/bin/ruby -e \"${PARSE_ID_RUBY}\")",
+                                             "curl -sS -X POST -H 'Content-Type: application/json' $CERT_ARGS \
+                                               https://$CLASSIFIER:4433/classifier-api/v1/groups/$ID/pin?nodes=#{agent_certname}"
+                                             ])
+        # Run the agent on the new CM
+        shell_provision_commands(machine, '/opt/puppetlabs/bin/puppet agent -t || true')
+        # Run the agent on the MoM to update the configuration
+        shell_provision_commands(master_vm, '/opt/puppetlabs/bin/puppet agent -t || true')
+      end
+
+      # Remove agent_type configuration from master_vm
+      def cleanup_agent_type
+        agent_certname = (machine.config.vm.hostname || machine.name).to_s
+
+        unless is_reachable?(master_vm)
+          master_vm.ui.warn I18n.t(
+            'pebuild.provisioner.pe_agent.skip_purge_master_not_reachable',
+            :master => master_vm.name.to_s
+          )
+          return
+        end
+
+        unless master_vm.communicate.test("/opt/puppetlabs/bin/puppet infrastructure status --host #{agent_certname} --verbose | grep -q -F #{agent_certname}", :sudo => true)
+          return
+        end
+
+        master_commands = []
+        machine_commands = []
+        # Setup a shell_provisioner
+        case config.agent_type
+          when 'replica'
+            # Stop the PE services on the replica
+            ['puppet', 'pxp-agent' 'pe-puppetserver', 'pe-puppetdb',
+             'pe-orchestration-services', 'pe-console-services', 'pe-postgresql'].each do | service |
+                machine_commands.push("/opt/puppetlabs/bin/puppet resource service #{service} ensure=stopped")
+            end
+
+            # Change directories to /tmp to avoid permissions errors with forget command
+            # Forget the replica on the master
+            master_commands.push('cd /tmp', "/opt/puppetlabs/bin/puppet infrastructure forget #{agent_certname}")
+
+          when 'compile'
+            # Unpin the node from PE Master
+            master_commands.push('set -e',
+                                 "CLASSIFIER=$(grep server /etc/puppetlabs/puppet/classifier.yaml | grep -Eo '([^ ]+)$')",
+                                 "CERT_ARGS=\"--cert $(/opt/puppetlabs/bin/puppet config print hostcert)\
+                                   --key $(/opt/puppetlabs/bin/puppet config print hostprivkey) \
+                                   --cacert $(/opt/puppetlabs/bin/puppet config print localcacert)\"",
+                                 "PARSE_ID_RUBY=\"require 'json'; puts JSON.parse(ARGF.read).find{ |group| group['name'] == 'PE Master' }['id']\"",
+                                 "ID=$(curl -sS -k $CERT_ARGS https://$CLASSIFIER:4433/classifier-api/v1/groups | \
+                                   /opt/puppetlabs/puppet/bin/ruby -e \"${PARSE_ID_RUBY}\")",
+                                 "curl -sS -X POST -H 'Content-Type: application/json' $CERT_ARGS \
+                                   https://$CLASSIFIER:4433/classifier-api/v1/groups/$ID/unpin?nodes=#{agent_certname}"
+                                 )
+          else
+            return
+        end
+
+         master_vm.ui.info I18n.t(
+           'pebuild.provisioner.pe_agent.cleaning_type',
+           :certname => agent_certname,
+           :master   => master_vm.name.to_s,
+           :type     => config.agent_type
+         )
+
+        # Run the shell provisioner
+        begin
+          shell_provision_commands(machine, machine_commands)
+          shell_provision_commands(master_vm, master_commands)
+        rescue Vagrant::Errors::VagrantError => e
+          master_vm.ui.error I18n.t(
+            'pebuild.provisioner.pe_agent.type_cleanup_failed',
+            :certname => agent_certname,
+            :master   => master_vm.name.to_s,
+            :error_class => e.class,
+            :message => e.message,
+            :type    => config.agent_type
+          )
+        end
+      end
+
     end
   end
 end

data/lib/pe_build/release.rb

@@ -47,7 +47,8 @@ module PEBuild
     require 'pe_build/release/2017_2'
     require 'pe_build/release/2017_3'
     require 'pe_build/release/2018_1'
+    require 'pe_build/release/2019_0'
 
-    LATEST_VERSION = '2018.1.0'
+    LATEST_VERSION = '2019.0.0'
   end
 end

data/lib/pe_build/release/2019_0.rb

@@ -0,0 +1,30 @@
+require 'pe_build/release'
+
+module PEBuild::Release
+  twentynineteen_aught_x = newrelease do
+    add_release :el, '5'
+    add_release :el, '6'
+    add_release :el, '7'
+
+    add_release :sles, '11'
+    add_release :sles, '12'
+
+    add_release :ubuntu, '14.04'
+    add_release :ubuntu, '16.04'
+    add_release :ubuntu, '18.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['2019.0.0'] = twentynineteen_aught_x
+end

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.17.14'.freeze
+  VERSION = '0.18.0'.freeze
 end

data/spec/unit/config/pe_agent_spec.rb

@@ -162,4 +162,38 @@ describe PEBuild::Config::PEAgent do
     end
   end
 
+  describe 'agent_type' do
+    it 'defaults to "agent"' do
+      subject.finalize!
+
+      expect(subject.agent_type).to eq 'agent'
+    end
+
+    it 'accepts "replica" as valid' do
+      subject.agent_type = 'replica'
+      subject.finalize!
+
+      expect(subject.agent_type).to eq 'replica'
+    end
+
+    it 'fails validation if set wrong' do
+      subject.agent_type = 'some-type'
+      subject.finalize!
+
+      errors = subject.validate(machine)
+
+      expect(errors['pe_agent provisioner'].join).to match(/An invalid agent_type of some-type/)
+    end
+
+    it 'fails validation if using an old PE version' do
+      subject.agent_type = 'replica'
+      subject.version = '2016.2.0'
+      subject.finalize!
+
+      errors = subject.validate(machine)
+
+      expect(errors['pe_agent provisioner'].join).to match(/The agent version 2016.2.0 is too old/)
+    end
+  end
+
 end

data/templates/locales/en.yml

@@ -90,6 +90,24 @@ en:
           %{message}
 
           Agent data will have to be removed from %{master} manually.
+        agent_type_provisioned: |-
+          Agent type already provisioned for %{certname} on %{master}. Skipping %{type} provisioning.
+        agent_type_invalid: |-
+          An invalid agent_type of %{type} has been specified for the agent. Valid types are
+          'agent', 'compile', and 'replica'.
+        provisioning_type: |-
+          Provisioning %{certname} as a %{type} on %{master}.
+        cleaning_type: |-
+          Forgetting %{certname} as a %{type} on %{master}.
+        code_manager_not_running: |-
+          Code Manager is not running on %{master}, cannot provision %{certname} as type %{type}.
+        type_cleanup_failed: |-
+          An error of type %{error_class} occurred while unconfiguring %{type}
+          agent %{certname} from %{master}:
+
+          %{message}
+
+          Any configuration items for %{certname} need to be cleaned up on %{master} manually.
     transfer:
       open_uri:
         download_failed: |-
@@ -144,6 +162,12 @@ en:
           version_too_old: |-
             The agent version %{version} is too old; pe_agent can only provision versions
             newer than %{minimum_version}.
+          agent_type_invalid: |-
+            An invalid agent_type of %{type} has been specified for the agent. Valid types are
+            'agent', 'compile', and 'replica'.
+          agent_type_version_too_old: |-
+            The agent version %{version} is too old for agent type %{agent_type}.
+            Please use %{minimum_version} or newer.
     cap:
       stage_installer:
         downloading_installer: |-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.17.14
+  version: 0.18.0
 platform: ruby
 authors:
 - Adrien Thebo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
@@ -152,6 +152,7 @@ files:
 - lib/pe_build/release/2017_2.rb
 - lib/pe_build/release/2017_3.rb
 - lib/pe_build/release/2018_1.rb
+- lib/pe_build/release/2019_0.rb
 - lib/pe_build/release/2_0.rb
 - lib/pe_build/release/2_5.rb
 - lib/pe_build/release/2_6.rb