vagrant-pe_build 0.12.0 → 0.13.0

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end

data/spec/unit/config/pe_agent_spec.rb

@@ -0,0 +1,154 @@
+require 'spec_helper'
+
+require 'pe_build/config'
+
+describe PEBuild::Config::PEAgent do
+  let(:machine)  { double('machine') }
+  let(:env) { double('vagrant environment') }
+
+  before(:each) do
+    allow(machine).to receive(:env).and_return(env)
+    allow(env).to receive(:machine_names).and_return([:master])
+  end
+
+  describe 'autosign' do
+    it 'defaults to true if master_vm is set' do
+      subject.master_vm = 'master'
+      subject.finalize!
+
+      expect(subject.autosign).to eq true
+    end
+
+    context 'when master_vm is unset' do
+      it 'defaults to false' do
+        subject.master_vm = nil
+        subject.finalize!
+
+        expect(subject.autosign).to eq false
+      end
+
+      it 'fails validation if set to true' do
+        subject.master    = 'some-hostname'
+        subject.master_vm = nil
+        subject.autosign  = true
+        subject.finalize!
+
+        errors = subject.validate(machine)
+
+        expect(errors['pe_agent provisioner'].to_s).to match(/Use of the .* setting requires master_vm/)
+      end
+    end
+  end
+
+  describe 'autopurge' do
+    it 'defaults to true if master_vm is set' do
+      subject.master_vm = 'master'
+      subject.finalize!
+
+      expect(subject.autopurge).to eq true
+    end
+
+    context 'when master_vm is unset' do
+      it 'defaults to false' do
+        subject.master_vm = nil
+        subject.finalize!
+
+        expect(subject.autopurge).to eq false
+      end
+
+      it 'fails validation if set to true' do
+        subject.master    = 'some-hostname'
+        subject.master_vm = nil
+        subject.autopurge = true
+        subject.finalize!
+
+        errors = subject.validate(machine)
+
+        expect(errors['pe_agent provisioner'].to_s).to match(/Use of the .* setting requires master_vm/)
+      end
+    end
+  end
+
+  describe 'master' do
+    it 'must be set if master_vm is nil' do
+      subject.master_vm = nil
+      subject.finalize!
+
+      errors = subject.validate(machine)
+
+      expect(errors['pe_agent provisioner'].to_s).to match(/No master or master_vm setting has been configured/)
+    end
+
+    it 'may be unset if master_vm is not nil' do
+      subject.master_vm = 'master'
+      subject.finalize!
+
+      errors = subject.validate(machine)
+
+      # Comparision against an empty array produces a better diff.
+      expect(errors['pe_agent provisioner']).to eq []
+    end
+  end
+
+  describe 'master_vm' do
+    it 'must be set to a defined machine' do
+      allow(env).to receive(:machine_names).and_return([:master])
+
+      subject.master_vm = 'some_machine'
+      subject.finalize!
+
+      errors = subject.validate(machine)
+
+      expect(errors['pe_agent provisioner'].to_s).to match(/The specified master_vm,.*, is not defined/)
+    end
+  end
+
+  describe 'version' do
+    before(:each) { subject.master = 'master.company.com' }
+
+    it 'defaults to "current"' do
+      subject.finalize!
+
+      expect(subject.version).to eq 'current'
+    end
+
+    it 'may be of the form x.y.z' do
+      subject.version = '2015.2.1'
+
+      subject.finalize!
+      errors = subject.validate(machine)
+
+      expect(errors['pe_agent provisioner']).to eq []
+    end
+
+    it 'may be of the form x.y.z[-other-arbitrary-stuff]' do
+      subject.version = '2015.2.1-r42-gsomesha'
+
+      subject.finalize!
+      errors = subject.validate(machine)
+
+      expect(errors['pe_agent provisioner']).to eq []
+    end
+
+    it 'may not be x.y' do
+      subject.version = '2015.2'
+
+      subject.finalize!
+      errors = subject.validate(machine)
+
+      # Casting the array to a string and using a regex matcher gives a nice
+      # diff in the case of failure.
+      expect(errors['pe_agent provisioner'].to_s).to match(/The agent version.*is invalid./)
+    end
+
+    it "must be greater than #{PEBuild::Config::PEAgent::MINIMUM_VERSION}" do
+      subject.version = '3.8.2'
+
+      subject.finalize!
+      errors = subject.validate(machine)
+
+      expect(errors['pe_agent provisioner'].to_s).to match(/The agent version.*is too old./)
+    end
+  end
+
+end

data/spec/unit/provisioner/pe_agent_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+require 'pe_build/provisioner/pe_agent'
+
+describe PEBuild::Provisioner::PEAgent do
+  include_context 'vagrant-unit'
+
+  subject { described_class.new(agent_vm, config) }
+
+  let(:test_env) do
+    env = isolated_environment
+    env.vagrantfile <<-EOF
+Vagrant.configure('2') do |config|
+  config.vm.define :agent_vm
+  config.vm.define :master_vm
+end
+EOF
+
+    env
+  end
+
+  let(:env)          { test_env.create_vagrant_env }
+  let(:agent_vm)     { env.machine(:agent_vm, :dummy) }
+  let(:master_vm)    { env.machine(:master_vm, :dummy) }
+  let(:config)       { PEBuild::Config::PEAgent.new }
+  # Mock the communicator to prevent SSH commands from being executed.
+  let(:agent_comm)   { double('agent_comm') }
+  let(:master_comm)  { double('master_comm') }
+  # Mock Vagrant IO.
+  let(:agent_ui)           { double('agent_ui') }
+  let(:master_ui)          { double('master_ui') }
+
+  before(:each) do
+    allow(agent_vm).to receive(:communicate).and_return(agent_comm)
+    allow(agent_vm).to receive(:ui).and_return(agent_ui)
+    allow(master_vm).to receive(:communicate).and_return(master_comm)
+    allow(master_vm).to receive(:ui).and_return(master_ui)
+
+    config.finalize!
+    # Skip provision-time inspection of machines.
+    agent_vm.stub_chain(:guest, :capability)
+    allow(subject).to receive(:provision_init!)
+  end
+
+  after(:each) { test_env.close }
+
+  context 'when an agent is installed' do
+    before(:each) do
+      allow(subject).to receive(:agent_version).and_return('1.0.0')
+    end
+
+    it 'logs a message and returns early' do
+      expect(agent_ui).to receive(:info).with(/Puppet agent .* is already installed/)
+      expect(subject).to_not receive(:provision_posix_agent)
+
+      subject.provision
+    end
+  end
+
+  context 'when an agent is not installed' do
+    before(:each) do
+      allow(subject).to receive(:agent_version).and_return(nil)
+      allow(subject).to receive(:provision_windows?).and_return(false)
+    end
+
+    context 'when master_vm is set' do
+      before(:each) do
+        allow(config).to receive(:master_vm).and_return(master_vm)
+      end
+
+      it 'raises an error if the master_vm is unreachable' do
+        allow(master_comm).to receive(:ready?).and_return(false)
+
+        expect { subject.provision }.to raise_error(::PEBuild::Util::MachineComms::MachineNotReachable)
+      end
+    end
+
+    context 'when osfamily is windows' do
+      before(:each) do
+        allow(subject).to receive(:provision_windows?).and_return(true)
+        allow(config).to receive(:master_vm).and_return(master_vm)
+      end
+
+      it 'invokes the windows provisioner and skips pe_repo' do
+        expect(subject).to receive(:provision_windows_agent)
+        expect(subject).to receive(:provision_pe_repo).never
+
+        subject.provision
+      end
+    end
+
+    context 'when osfamily is not windows' do
+      it 'invokes the posix agent provisioner' do
+        expect(subject).to receive(:provision_posix_agent)
+
+        subject.provision
+      end
+    end
+
+  end
+end

data/tasks/acceptance.rake

@@ -1,7 +1,8 @@
 namespace :acceptance do
   ARTIFACT_DIR = File.join('acceptance', 'artifacts')
   TEST_BOXES = {
-    'virtualbox.box' => 'https://s3.amazonaws.com/puppetlabs-vagrantcloud/centos-6.6-x86_64-virtualbox-nocm-1.0.1.box'
+    'centos-virtualbox.box' => 'https://s3.amazonaws.com/puppetlabs-vagrantcloud/centos-6.6-x86_64-virtualbox-nocm-1.0.2.box',
+    'ubuntu-virtualbox.box' => 'https://s3.amazonaws.com/puppetlabs-vagrantcloud/ubuntu-14.04-x86_64-virtualbox-nocm-1.0.2.box'
   }
 
   directory ARTIFACT_DIR

data/templates/locales/en.yml

@@ -1,5 +1,16 @@
 en:
   pebuild:
+    command:
+      facts:
+        vm_not_running: |-
+          Could not establish a connection to %{vm_name} in order to retrieve
+          facts. This usually means the machine is either shut down,
+          or has not been created.
+    errors:
+      machine_not_reachable: |-
+        The specified Vagrant machine, %{vm_name}, is not able to recieve
+        communication. This typically means the machine has not been created,
+        is shut down, or there is an issue with the SSH or WinRM communicator.
     archive:
       no_installer_source: |-
         The Puppet Enterprise installer %{filename}
@@ -21,6 +32,33 @@ en:
           unset_version: |-
             The Puppet Enterprise version must be set either on the global pe_build config
             object or specified on a per-provisioner basis, but both were unset.
+      pe_agent:
+        already_installed: |-
+          Puppet agent %{version} is already installed, skipping installation.
+        pe_repo_present: |-
+          The Puppet Server on %{vm_name} is configured with Agent repositories for:
+            %{platform_tag}
+        adding_pe_repo: |-
+          Configuring Puppet Server on %{vm_name} with Agent repositories for:
+            %{platform_tag}
+        no_csr_pending: |-
+          No pending signing request for %{certname} on %{master}. Skipping autosign.
+        signing_agent_cert: |-
+          Signing request for %{certname} on %{master}.
+        skip_purge_no_master: |-
+          The VM hosting the Puppet Master, %{master}, is no longer available.
+          This commonly means the machine has been destroyed.
+          Skipping purge of agent data.
+        skip_purge_master_not_reachable: |-
+          The VM hosting the Puppet Master, %{master}, is not accepting SSH or
+          WinRM communication. This commonly means the machine has been
+          shut down.
+          Skipping purge of agent data.
+        agent_purged: |-
+          No certificate for %{certname} on %{master}.
+          Skipping purge of agent data.
+        purging_agent: |-
+          Purging agent data for %{certname} from %{master}.
     transfer:
       open_uri:
         download_failed: |-
@@ -60,6 +98,21 @@ en:
             Autosign must be one of %{autosign_classes}, but was of type %{autosign}.
           invalid_answer_extras: |-
             Answer_extras must be an Array, got a %{class}.
+      pe_agent:
+        errors:
+          master_vm_required: |-
+            Use of the %{setting} setting requires master_vm to be specified.
+          no_master: |-
+            No master or master_vm setting has been configured for this agent.
+          master_vm_not_defined: |-
+            The specified master_vm, %{vm_name}, is not defined by the current
+            Vagrant environment.
+          malformed_version: |-
+            The agent version "%{version}":%{version_class} is invalid; it must be a String of
+            the format "x.y.z[-optional-stuff]" or "current".
+          version_too_old: |-
+            The agent version %{version} is too old; pe_agent can only provision versions
+            newer than %{minimum_version}.
     cap:
       run_install:
         already_installed: |-

data/vagrant-pe_build.gemspec

@@ -7,11 +7,11 @@ Gem::Specification.new do |gem|
   gem.name        = "vagrant-pe_build"
   gem.version     = PEBuild::VERSION
 
-  gem.authors  = 'Adrien Thebo'
-  gem.email    = 'adrien@somethingsinistral.net'
-  gem.homepage = 'https://github.com/adrienthebo/vagrant-pe_build'
+  gem.authors  = ['Adrien Thebo', 'Charlie Sharpsteen']
+  gem.email    = ['adrien@somethingsinistral.net', 'source@sharpsteen.net']
+  gem.homepage = 'https://github.com/oscar-stack/vagrant-pe_build'
 
-  gem.summary     = "Vagrant provisioner for installing Puppet Enterprise"
+  gem.summary     = "Vagrant provisioners for installing Puppet Enterprise"
 
   gem.files        = %x{git ls-files -z}.split("\0")
   gem.require_path = 'lib'

data/vagrant-spec.config.example.rb

@@ -10,7 +10,7 @@ Vagrant::Spec::Acceptance.configure do |c|
   c.skeleton_paths = [(acceptance_dir + 'skeletons').to_s]
 
   c.provider 'virtualbox',
-    box: (acceptance_dir + 'artifacts' + 'virtualbox.box').to_s,
+    boxes: Dir[acceptance_dir + 'artifacts' + '*-virtualbox.box'],
     # This folder should be filled with PE tarballs for CentOS.
     archive_path: (acceptance_dir + 'artifacts' + 'pe_archives').to_s,
     pe_latest: '2015.2.0',

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Adrien Thebo
+- Charlie Sharpsteen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
@@ -67,7 +68,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.14.0
 description: 
-email: adrien@somethingsinistral.net
+email:
+- adrien@somethingsinistral.net
+- source@sharpsteen.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -107,22 +110,34 @@ files:
 - lib/pe_build/cap/detect_installer/solaris.rb
 - lib/pe_build/cap/detect_installer/ubuntu.rb
 - lib/pe_build/cap/detect_installer/windows.rb
+- lib/pe_build/cap/facts/base.rb
+- lib/pe_build/cap/facts/debian.rb
+- lib/pe_build/cap/facts/posix.rb
+- lib/pe_build/cap/facts/redhat.rb
+- lib/pe_build/cap/facts/solaris.rb
+- lib/pe_build/cap/facts/suse.rb
+- lib/pe_build/cap/facts/ubuntu.rb
+- 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/command.rb
 - lib/pe_build/command/base.rb
 - lib/pe_build/command/copy.rb
+- lib/pe_build/command/facts.rb
 - lib/pe_build/command/list.rb
 - lib/pe_build/config.rb
 - lib/pe_build/config/global.rb
+- 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/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
 - lib/pe_build/plugin.rb
+- lib/pe_build/provisioner/pe_agent.rb
 - lib/pe_build/provisioner/pe_bootstrap.rb
 - lib/pe_build/provisioner/pe_bootstrap/answers_file.rb
 - lib/pe_build/provisioner/pe_bootstrap/post_install.rb
@@ -149,6 +164,8 @@ files:
 - lib/pe_build/unpack/tar.rb
 - lib/pe_build/unpack/tar_gz.rb
 - lib/pe_build/util/config.rb
+- lib/pe_build/util/machine_comms.rb
+- lib/pe_build/util/pe_packaging.rb
 - lib/pe_build/util/version_string.rb
 - lib/pe_build/util/versioned_path.rb
 - lib/pe_build/version.rb
@@ -156,7 +173,9 @@ files:
 - spec/shared/helpers/webserver_context.rb
 - spec/spec_helper.rb
 - spec/unit/config/global_spec.rb
+- spec/unit/config/pe_agent_spec.rb
 - spec/unit/config/pe_bootstrap_spec.rb
+- spec/unit/provisioner/pe_agent_spec.rb
 - spec/unit/provisioner/pe_bootstrap_answers_spec.rb
 - spec/unit/util/config_spec.rb
 - tasks/acceptance.rake
@@ -174,7 +193,7 @@ files:
 - templates/locales/en.yml
 - vagrant-pe_build.gemspec
 - vagrant-spec.config.example.rb
-homepage: https://github.com/adrienthebo/vagrant-pe_build
+homepage: https://github.com/oscar-stack/vagrant-pe_build
 licenses:
 - Apache 2.0
 metadata: {}
@@ -197,5 +216,5 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Vagrant provisioner for installing Puppet Enterprise
+summary: Vagrant provisioners for installing Puppet Enterprise
 test_files: []