vagrant-pe_build 0.12.0 → 0.13.0

data/acceptance/pe_build/pe_bootstrap_latest_spec.rb

@@ -1,7 +1,7 @@
 shared_examples 'provider/provisioner/pe_bootstrap/latest' do |provider, options|
-  if !File.file?(options[:box])
+  if options[:boxes].empty?
     raise ArgumentError,
-      "A box file must be downloaded for provider: #{provider}. Try: rake acceptance:setup"
+      "Box files must be downloaded for provider: #{provider}. Try: rake acceptance:setup"
   end
 
   include_context 'acceptance'
@@ -19,7 +19,10 @@ shared_examples 'provider/provisioner/pe_bootstrap/latest' do |provider, options
 
   before(:each) do
     environment.skeleton('pe_build')
-    assert_execute('vagrant', 'box', 'add', 'box', options[:box])
+    options[:boxes].each do |box|
+      name = File.basename(box).split('-').first
+      assert_execute('vagrant', 'box', 'add', name, box)
+    end
   end
 
   after(:each) do

data/acceptance/skeletons/2015x_acceptance/Vagrantfile

@@ -7,88 +7,64 @@ end
 
 Vagrant.configure('2') do |config|
   config.pe_build.download_root = ENV['PE_BUILD_DOWNLOAD_ROOT']
-  # This is the box name used by the setup helpers in the acceptance tests.
-  config.vm.box = 'box'
-  config.vm.provision :shell, :inline => 'service iptables stop'
 
-  config.vm.define 'pe-201520-master' do |node|
-    node.vm.hostname = 'pe-201520-master.pe-bootstrap.vlan'
+  config.vm.define 'pe-20152-master' do |node|
+    node.vm.hostname = 'pe-20152-master.pe-bootstrap.vlan'
+    node.vm.box      = 'centos'
     # All-in-one master nodes need a generous amount of RAM for all the Java.
     set_resources node, 4096, 1
+    node.vm.provision :shell, :inline => 'service iptables stop'
 
     node.vm.network 'private_network', :ip => '10.20.1.100'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.101 pe-201520-agent.pe-bootstrap.vlan" >> /etc/hosts'
-
-    node.vm.provision :pe_bootstrap do |p|
-      p.version = '2015.2.0'
-      p.role = :master
-    end
-  end
-
-  config.vm.define 'pe-201520-agent' do |node|
-    node.vm.hostname = 'pe-201520-agent.pe-bootstrap.vlan'
-
-    node.vm.network 'private_network', :ip => '10.20.1.101'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.100 pe-201520-master.pe-bootstrap.vlan" >> /etc/hosts'
-
-    node.vm.provision :pe_bootstrap do |p|
-      p.version = '2015.2.0'
-      p.role = :agent
-      p.master = 'pe-201520-master.pe-bootstrap.vlan'
-    end
-  end
-
-  config.vm.define 'pe-201521-master' do |node|
-    node.vm.hostname = 'pe-201521-master.pe-bootstrap.vlan'
-    # All-in-one master nodes need a generous amount of RAM for all the Java.
-    set_resources node, 4096, 1
-
-    node.vm.network 'private_network', :ip => '10.20.1.102'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.103 pe-201521-agent.pe-bootstrap.vlan" >> /etc/hosts'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.101 pe-20152-agent.pe-bootstrap.vlan" >> /etc/hosts'
 
     node.vm.provision :pe_bootstrap do |p|
       p.version = '2015.2.1'
       p.role = :master
+      # Set autosign to false so that we can test pe_agent functionality.
+      p.autosign = false
     end
   end
 
-  config.vm.define 'pe-201521-agent' do |node|
-    node.vm.hostname = 'pe-201521-agent.pe-bootstrap.vlan'
+  config.vm.define 'pe-20152-agent' do |node|
+    node.vm.hostname = 'pe-20152-agent.pe-bootstrap.vlan'
+    node.vm.box      = 'ubuntu'
 
-    node.vm.network 'private_network', :ip => '10.20.1.103'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.102 pe-201521-master.pe-bootstrap.vlan" >> /etc/hosts'
+    node.vm.network 'private_network', :ip => '10.20.1.101'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.100 pe-20152-master.pe-bootstrap.vlan" >> /etc/hosts'
 
-    node.vm.provision :pe_bootstrap do |p|
-      p.version = '2015.2.1'
-      p.role = :agent
-      p.master = 'pe-201521-master.pe-bootstrap.vlan'
+    node.vm.provision :pe_agent do |p|
+      p.master_vm = 'pe-20152-master'
     end
   end
 
   config.vm.define 'pe-2015latest-master' do |node|
     node.vm.hostname = 'pe-2015latest-master.pe-bootstrap.vlan'
+    node.vm.box      = 'centos'
     # All-in-one master nodes need a generous amount of RAM for all the Java.
     set_resources node, 4096, 1
+    node.vm.provision :shell, :inline => 'service iptables stop'
 
-    node.vm.network 'private_network', :ip => '10.20.1.104'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.105 pe-2015latest-agent.pe-bootstrap.vlan" >> /etc/hosts'
+    node.vm.network 'private_network', :ip => '10.20.1.102'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.103 pe-2015latest-agent.pe-bootstrap.vlan" >> /etc/hosts'
 
     node.vm.provision :pe_bootstrap do |p|
       p.version_file = 'LATEST'
       p.role = :master
+      # Set autosign to false so that we can test pe_agent functionality.
+      p.autosign = false
     end
   end
 
   config.vm.define 'pe-2015latest-agent' do |node|
     node.vm.hostname = 'pe-2015latest-agent.pe-bootstrap.vlan'
+    node.vm.box      = 'ubuntu'
 
-    node.vm.network 'private_network', :ip => '10.20.1.105'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.104 pe-2015latest-master.pe-bootstrap.vlan" >> /etc/hosts'
+    node.vm.network 'private_network', :ip => '10.20.1.103'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.102 pe-2015latest-master.pe-bootstrap.vlan" >> /etc/hosts'
 
-    node.vm.provision :pe_bootstrap do |p|
-      p.version_file = 'LATEST'
-      p.role = :agent
-      p.master = 'pe-2015latest-master.pe-bootstrap.vlan'
+    node.vm.provision :pe_agent do |p|
+      p.master_vm = 'pe-2015latest-master'
     end
   end
 end

data/acceptance/skeletons/pe_build/Vagrantfile

@@ -8,7 +8,7 @@ end
 Vagrant.configure('2') do |config|
   config.pe_build.download_root = ENV['PE_BUILD_DOWNLOAD_ROOT']
   # This is the box name used by the setup helpers in the acceptance tests.
-  config.vm.box = 'box'
+  config.vm.box = 'centos'
 
   config.vm.define 'pe-3x' do |node|
     node.vm.hostname = 'pe-3x.pe-bootstrap.vlan'

data/lib/pe_build/cap.rb

@@ -17,6 +17,15 @@ module PEBuild
       require 'pe_build/cap/detect_installer/solaris'
     end
 
+    module Facts
+      require 'pe_build/cap/facts/redhat'
+      require 'pe_build/cap/facts/debian'
+      require 'pe_build/cap/facts/ubuntu'
+      require 'pe_build/cap/facts/suse'
+      require 'pe_build/cap/facts/solaris'
+      require 'pe_build/cap/facts/windows'
+    end
+
     module RunInstall
       require 'pe_build/cap/run_install/posix'
       require 'pe_build/cap/run_install/windows'

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

@@ -12,4 +12,22 @@ class PEBuild::Cap::DetectInstaller::Base
   #   Return the installer for the given operating system
   #   @abstract
   #   @return [String] The installer for the given operating system
+
+  private
+
+  # TODO: Consolidate with implementation in Cap::Facts::Base.
+  def execute_command(cmd)
+    stdout = ''
+    stderr = ''
+
+    retval = @machine.communicate.execute(cmd, :error_check => false) do |type, data|
+      if type == :stderr
+        stderr << data
+      else
+        stdout << data
+      end
+    end
+
+    {:stdout => stdout.chomp, :stderr => stderr.chomp, :retval => retval}
+  end
 end

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

@@ -87,19 +87,4 @@ class PEBuild::Cap::DetectInstaller::POSIX < PEBuild::Cap::DetectInstaller::Base
 
     matchdata[1]
   end
-
-  def execute_command(cmd)
-    stdout = ''
-    stderr = ''
-
-    retval = @machine.communicate.execute(cmd, :error_check => false) do |type, data|
-      if type == :stderr
-        stderr << data
-      else
-        stdout << data
-      end
-    end
-
-    {:stdout => stdout.chomp, :stderr => stderr.chomp, :retval => retval}
-  end
 end

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

@@ -1,13 +1,31 @@
-# Provide an abstract base class for detecting the installer name on
-# POSIX systems.
+require 'pe_build/util/version_string'
+
+# detect_installer implementation for Windows guests
 #
 # @abstract
 # @api protected
 class PEBuild::Cap::DetectInstaller::Windows < PEBuild::Cap::DetectInstaller::Base
 
   def detect
-    # Yes, it really is this simple. For Windows anyway.
-    "puppet-enterprise-#{@version}.msi"
+    # Starting with PE 3.7.0, separate 64-bit packages are shipped for Windows.
+    if (PEBuild::Util::VersionString.compare(@version, '3.7.0') >= 0) && (arch == 'x64')
+      "puppet-enterprise-#{@version}-x64.msi"
+    else
+      "puppet-enterprise-#{@version}.msi"
+    end
+  end
+
+  # @since 0.13.0
+  def arch
+    results = execute_command('if ([System.IntPtr]::Size -eq 4) { "x86" } else { "x64" }')
+
+    unless results[:retval] == 0
+      raise PEBuild::Cap::DetectInstaller::DetectFailed,
+        :name  => @machine.name,
+        :error => "Could not determine Windows architecture on #{@machine.name}: got #{results[:stderr]}"
+    end
+
+    results[:stdout]
   end
 
 end

data/lib/pe_build/cap/facts/base.rb

@@ -0,0 +1,119 @@
+require 'json'
+
+# Base class for retrieving facts from guest VMs
+#
+# This class implements a Guest Capability for Fact retrieval. Puppet will be
+# queried, if installed. Otherwise, a minimal set of base facts willPuppetbe
+# returned by {#basic_facts}.
+#
+# @abstract Subclass and override {#architecture}, {#os_info} and
+#   {#release_info} to implement for a particular guest operating system.
+#
+# @since 0.13.0
+class PEBuild::Cap::Facts::Base
+
+  # Retrieve facts from a guest VM
+  #
+  # See {#load_facts} for implementation details.
+  #
+  # @return [Hash] A hash of facts.
+  def self.pebuild_facts(machine)
+    new(machine).load_facts
+  end
+
+  attr_reader :machine
+
+  def initialize(machine)
+    @machine = machine
+  end
+
+  def puppet_path
+    @puppet_path ||= find_puppet
+  end
+
+  # Load Facts from the guest VM
+  #
+  # @return [Hash] A hash of facts from Puppet, if installed.
+  # @return [Hash] A hash containing the results of {#basic_facts} if
+  #   Facter is not installed.
+  def load_facts
+    unless puppet_path.nil?
+      certname  = sudo("#{puppet_path} agent --configprint certname")[:stdout].chomp
+      raw_facts = JSON.load(sudo("#{puppet_path} facts find --render-as json --terminus facter #{certname}")[:stdout])
+      facts = raw_facts['values']
+      # Keep the certname of the agent.
+      facts['certname'] = certname
+    else
+      # Puppet isn't installed yet, so we gather a minimal set of info.
+      facts = basic_facts
+    end
+
+    # JSON.load can do funny things. Sort by top-level key.
+    Hash[facts.sort]
+  end
+
+  # Determine basic info about a guest
+  #
+  # This function returns a minimal set of basic facts which should be
+  # sufficient to determine what software to install on the guest.
+  #
+  # @return [Hash] A hash containing the `architecture` and `os` facts.
+  def basic_facts
+    {
+      'architecture' => architecture,
+      'os' => {
+        'release' => release_info
+      }.update(os_info)
+    }
+  end
+
+  # Returns the native architecture of the OS
+  #
+  # @return [String] An architecture, such as `i386` or `x86_64`.
+  def architecture
+    raise NotImplementedError
+  end
+
+  # Returns info about the OS type
+  #
+  # @return [Hash] A hash containing the `family` of the operating system and,
+  #   optionally, the `name`.
+  def os_info
+    raise NotImplementedError
+  end
+
+  # Returns info about the OS version
+  #
+  # @return [Hash] A hash containing the `full` version strying of the
+  #   operating system and, optionally, the `minor` and `major`
+  #   release versions.
+  def release_info
+    raise NotImplementedError
+  end
+
+  private
+
+  # Override this method to implement a more sophisticated search for the
+  # Puppet executable.
+  def find_puppet
+    return 'puppet' if @machine.communicate.test('puppet --version')
+    return nil
+  end
+
+  # TODO: Split this out into a shared module.
+  def sudo(cmd)
+    stdout = ''
+    stderr = ''
+
+    retval = machine.communicate.sudo(cmd) do |type, data|
+      if type == :stderr
+        stderr << data.chomp
+      else
+        stdout << data.chomp
+      end
+    end
+
+    {:stdout => stdout, :stderr => stderr, :retval => retval}
+  end
+
+end

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

@@ -0,0 +1,37 @@
+require_relative 'posix'
+
+# Facts implementation for Debian guests
+#
+# @since 0.13.0
+class PEBuild::Cap::Facts::Debian < PEBuild::Cap::Facts::POSIX
+
+  # (see PEBuild::Cap::Facts::Base#os_info)
+  #
+  # Returns `family` as `Debian` and `name` as `Debian`.
+  #
+  # @see PEBuild::Cap::Facts::Base#os_info
+  def os_info
+    {
+      'name'   => 'Debian',
+      'family' => 'Debian'
+    }
+  end
+
+  # (see PEBuild::Cap::Facts::Base#release_info)
+  #
+  # Reads `/etc/debian_version` and generates a `full` version along with
+  # `major` and `minor` components.
+  #
+  # @see PEBuild::Cap::Facts::Base#release_info
+  def release_info
+    release_file = sudo('cat /etc/debian_version')[:stdout]
+    version = release_file.match(/(\d+\.\d+)/)[1]
+
+    {
+      'major' => version.split('.', 2)[0],
+      'minor' => version.split('.', 2)[1],
+      'full'  => version
+    }
+  end
+
+end

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

@@ -0,0 +1,36 @@
+require_relative 'base'
+
+# Base class for retrieving facts from POSIX
+#
+# @abstract Subclass and override {#os_info} and {#release_info} to implement
+#   for a particular POSIX system.
+#
+# @since 0.13.0
+class PEBuild::Cap::Facts::POSIX < PEBuild::Cap::Facts::Base
+
+  # (see PEBuild::Cap::Facts::Base#architecture)
+  #
+  # This method is a concrete implementation which uses `uname -m`.
+  #
+  # @see PEBuild::Cap::Facts::Base#architecture
+  def architecture
+    sudo('uname -m')[:stdout]
+  end
+
+  private
+
+  def find_facter
+    paths = %w[
+      /opt/puppetlabs/bin/puppet
+      /opt/puppet/bin/puppet
+      /usr/local/bin/puppet
+    ]
+
+    paths.each do |path|
+      return path if @machine.communicate.test("#{path} --version")
+    end
+
+    return nil
+  end
+
+end

data/lib/pe_build/cap/facts/redhat.rb

@@ -0,0 +1,37 @@
+require_relative 'posix'
+
+# Facts implementation for RedHat guests
+#
+# @since 0.13.0
+class PEBuild::Cap::Facts::RedHat < PEBuild::Cap::Facts::POSIX
+
+  # (see PEBuild::Cap::Facts::Base#os_info)
+  #
+  # Currently returns `family` as `RedHat`.
+  # @todo Implement `name` detection (RHEL, CentOS, Sci. Linux, etc.).
+  #
+  # @see PEBuild::Cap::Facts::Base#os_info
+  def os_info
+    {
+      'family' => 'RedHat'
+    }
+  end
+
+  # (see PEBuild::Cap::Facts::Base#release_info)
+  #
+  # Reads `/etc/redhat-release` and generates a `full` version along with
+  # `major` and `minor` components.
+  #
+  # @see PEBuild::Cap::Facts::Base#release_info
+  def release_info
+    release_file = sudo('cat /etc/redhat-release')[:stdout]
+    version = release_file.match(/release (\d+\.\d+)/)[1]
+
+    {
+      'major' => version.split('.', 2)[0],
+      'minor' => version.split('.', 2)[1],
+      'full'  => version
+    }
+  end
+
+end