vagrant-pe_build 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 355da7b9e79746b79c4ccf345a1621829ba742e9
-  data.tar.gz: 3bb3a1c6ea2b98e6c0ed58bc32ea7f735fd3aabc
+  metadata.gz: fab41cebad5a61a3fabebcabe67f0110a8722b7a
+  data.tar.gz: f1cf6cb8270f2e4b145eb11d32867f71f135fb5e
 SHA512:
-  metadata.gz: f17168a6942f7d7bce0b71311b7de4345b7de00f4c9993a949b7e39862dd8576cf5659aeaf710627942f413dd0c84814f50dab5bc87b377238308e717f282108
-  data.tar.gz: eec273bcbbfc37e7c13fb7af89204aa1a230de93d5997ca18a8d50d3d61cc320ceb5192dc208348660099d535f84d51cc192c7dcd9e8c6d0dbccc7098d60fdf6
+  metadata.gz: 89518f8d9c34e9b6f8586a31b37bfd2c358056959539e53f727da5b7e8a0c746d0f76305674c062f42121adb4eb4fb0bbf1a59e4c8836e7261a81df20293a66f
+  data.tar.gz: b0f3fab88367f4b524a1dea56ef10e7197d7bd3be812370df8ec2e691728878128b52be239e14b8f88d2a3f123fe57d60bcaf045a4c78b726a0629f158cf4916

data/CHANGELOG

@@ -1,6 +1,15 @@
 vagrant-pe_build
 ================
 
+0.10.2
+------
+
+2015-06-08
+
+This is a backwards compatible bugfix release.
+
+  * Fix compatibility issues with Puppet Server and Puppet 4.
+
 0.10.1
 ------
 

data/acceptance/pe_build/pe_bootstrap_3x_spec.rb

@@ -0,0 +1,33 @@
+shared_examples 'provider/provisioner/pe_bootstrap/3x' do |provider, options|
+  if !File.file?(options[:box])
+    raise ArgumentError,
+      "A box file must be downloaded for provider: #{provider}. Try: rake acceptance:setup"
+  end
+
+  include_context 'acceptance'
+
+  let(:extra_env) do
+    vars = options[:env_vars].dup
+    vars['PE_BUILD_DOWNLOAD_ROOT'] = options[:archive_path]
+
+    vars
+  end
+
+  before(:each) do
+    # The skelton sets up a Vagrantfile which expects the OS under test to be
+    # available as `box`.
+    environment.skeleton('pe_build')
+    assert_execute('vagrant', 'box', 'add', 'box', options[:box])
+  end
+
+  after(:each) do
+    # Ensure any VMs that survived tests are cleaned up.
+    assert_execute('vagrant', 'destroy', '--force', log: false)
+  end
+
+  context 'when installing PE 3.x' do
+    it 'provisions with pe_build' do
+      assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-3x')
+    end
+  end
+end

data/acceptance/pe_build/pe_bootstrap_latest_spec.rb

@@ -0,0 +1,35 @@
+shared_examples 'provider/provisioner/pe_bootstrap/latest' do |provider, options|
+  if !File.file?(options[:box])
+    raise ArgumentError,
+      "A box file must be downloaded for provider: #{provider}. Try: rake acceptance:setup"
+  end
+
+  include_context 'acceptance'
+
+  let(:webserver_port) { 3838 }
+  let(:webserver_path) { options[:archive_path] }
+  let(:extra_env) do
+    vars = options[:env_vars].dup
+    vars['PE_BUILD_DOWNLOAD_ROOT'] = "http://localhost:#{webserver_port}"
+
+    vars
+  end
+
+  include_context 'webserver'
+
+  before(:each) do
+    environment.skeleton('pe_build')
+    assert_execute('vagrant', 'box', 'add', 'box', options[:box])
+  end
+
+  after(:each) do
+    # Ensure any VMs that survived tests are cleaned up.
+    assert_execute('vagrant', 'destroy', '--force', log: false)
+  end
+
+  context 'when installing LATEST from a build server' do
+    it 'provisions with pe_build' do
+      assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-latest')
+    end
+  end
+end

data/acceptance/skeletons/pe_build/Vagrantfile

@@ -1,24 +1,34 @@
+def set_resources box, max_ram=512, max_cpu=1
+  box.vm.provider :virtualbox do |vb|
+    vb.customize ["modifyvm", :id, "--cpus", max_cpu]
+    vb.customize ["modifyvm", :id, "--memory", max_ram]
+  end
+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.define 'explicit-version' do |node|
+  config.vm.define 'pe-3x' do |node|
+    node.vm.hostname = 'pe-3x.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.provision :pe_bootstrap do |p|
-      p.version = '3.2.3'
-      p.role = :agent
-      # Basically the stock answer file with:
-      #   q_fail_on_unsuccessful_master_lookup=n
-      p.answer_file = File.join(File.dirname(__FILE__), 'agent-3.x.txt.erb')
+      p.version = '3.8.0'
+      p.role = :master
     end
   end
 
-  config.vm.define 'latest-version' do |node|
+  config.vm.define 'pe-latest' do |node|
+    node.vm.hostname = 'pe-latest.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.provision :pe_bootstrap do |p|
-      p.version_file = 'LATEST'
-      p.role = :agent
-      # Basically the stock answer file with:
-      #   q_fail_on_unsuccessful_master_lookup=n
-      p.answer_file = File.join(File.dirname(__FILE__), 'agent-3.x.txt.erb')
+      p.version_file  = 'LATEST'
+      p.role = :master
     end
   end
 end

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

@@ -5,7 +5,9 @@ class PEBuild::Cap::RunInstall::POSIX
 
   def self.run_install(machine, config, archive)
 
-    if machine.communicate.test('test -f /opt/puppet/pe_version')
+    # 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

data/lib/pe_build/config_builder/global.rb

@@ -36,12 +36,12 @@ class PEBuild::ConfigBuilder::Global < ::ConfigBuilder::Model::Base
 
   def to_proc
     Proc.new do |global_config|
-      global_config.pe_build.download_root = attr(:download_root) if attr(:download_root)
-      global_config.pe_build.version       = attr(:version)       if attr(:version)
-      global_config.pe_build.version_file  = attr(:version_file)  if attr(:version_file)
-      global_config.pe_build.series        = attr(:series)        if attr(:series)
-      global_config.pe_build.suffix        = attr(:suffix)        if attr(:suffix)
-      global_config.pe_build.filename      = attr(:filename)      if attr(:filename)
+      with_attr(:download_root) { |val| global_config.pe_build.download_root = val }
+      with_attr(:version)       { |val| global_config.pe_build.version       = val }
+      with_attr(:version_file)  { |val| global_config.pe_build.version_file  = val }
+      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 }
     end
   end
 end

data/lib/pe_build/config_builder/pe_bootstrap.rb

@@ -44,19 +44,19 @@ class PEBuild::ConfigBuilder::PEBootstrap < ::PEBuild::ConfigBuilder::Global
     Proc.new do |vm_config|
       vm_config.provision :pe_bootstrap do |pe|
         # Globally settable attributes
-        pe.download_root = attr(:download_root) if attr(:download_root)
-        pe.version       = attr(:version)       if attr(:version)
-        pe.version_file  = attr(:version_file)  if attr(:version_file)
-        pe.series        = attr(:series)        if attr(:series)
-        pe.suffix        = attr(:suffix)        if attr(:suffix)
-        pe.filename      = attr(:filename)      if attr(:filename)
+        with_attr(:download_root) { |val| pe.download_root = val }
+        with_attr(:version)       { |val| pe.version       = val }
+        with_attr(:version_file)  { |val| pe.version_file  = val }
+        with_attr(:series)        { |val| pe.series        = val }
+        with_attr(:suffix)        { |val| pe.suffix        = val }
+        with_attr(:filename)      { |val| pe.filename      = val }
 
-        pe.role               = attr(:role)               if attr(:role)
-        pe.verbose            = attr(:verbose)            if attr(:verbose)
-        pe.master             = attr(:master)             if attr(:master)
-        pe.answer_file        = attr(:answer_file)        if attr(:answer_file)
-        pe.relocate_manifests = attr(:relocate_manifests) if attr(:relocate_manifests)
-        pe.autosign           = attr(:autosign)           if attr(:autosign)
+        with_attr(:role)               { |val| pe.role               = val }
+        with_attr(:verbose)            { |val| pe.verbose            = val }
+        with_attr(:master)             { |val| pe.master             = val }
+        with_attr(:answer_file)        { |val| pe.answer_file        = val }
+        with_attr(:relocate_manifests) { |val| pe.relocate_manifests = val }
+        with_attr(:autosign)           { |val| pe.autosign           = val }
       end
     end
   end

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

@@ -1,4 +1,5 @@
 require 'pe_build/on_machine'
+require 'pe_build/util/version_string'
 
 class PEBuild::Provisioner::PEBootstrap::PostInstall
 
@@ -17,14 +18,23 @@ class PEBuild::Provisioner::PEBootstrap::PostInstall
 
       resources = []
 
+      if PEBuild::Util::VersionString.compare(@config.version, '3.7.0') < 0 then
+        resources << gen_httpd
+      else
+        resources << gen_puppetserver
+      end
       resources << gen_relocate if @config.relocate_manifests
       resources << gen_autosign if @config.autosign
-      resources << gen_service
 
       manifest = resources.join("\n\n")
       write_manifest(manifest)
 
-      puppet_apply  = "/opt/puppet/bin/puppet apply"
+      if PEBuild::Util::VersionString.compare(@config.version, '4.0.0') < 0 then
+        puppet_apply  = "/opt/puppet/bin/puppet apply"
+      else
+        puppet_apply  = "/opt/puppetlabs/bin/puppet apply"
+      end
+
       manifest_path = "/vagrant/.pe_build/post-install/#{@machine.name}.pp"
 
       on_machine(@machine, "#{puppet_apply} #{manifest_path}")
@@ -46,14 +56,14 @@ class PEBuild::Provisioner::PEBootstrap::PostInstall
     manifest = <<-MANIFEST.gsub(/^\s{6}/, '')
       augeas { 'move_manifestdir':
         changes => 'set etc/puppetlabs/puppet/puppet.conf/main/manifestdir /manifests',
-        notify  => Service['pe-httpd'],
+        notify  => Service[$pe_master_service],
       }
 
       # Update puppet.conf to add the modulepath directive to point to the
       # /module mount, if it hasn't already been set.
       augeas { 'move_modulepath':
         changes => 'set etc/puppetlabs/puppet/puppet.conf/main/modulepath /modules',
-        notify  => Service['pe-httpd'],
+        notify  => Service[$pe_master_service],
       }
 
       # Rewrite the olde site.pp config since it's not used, and warn people
@@ -62,7 +72,7 @@ class PEBuild::Provisioner::PEBootstrap::PostInstall
         ensure  => file,
         path    => '/etc/puppetlabs/puppet/manifests/site.pp',
         content => '# /etc/puppetlabs/puppet/manifests is not used; see /manifests.',
-        notify  => Service['pe-httpd'],
+        notify  => Service[$pe_master_service],
       }
     MANIFEST
 
@@ -89,16 +99,30 @@ class PEBuild::Provisioner::PEBootstrap::PostInstall
         owner   => 'root',
         group   => 'pe-puppet',
         mode    => '0644',
-        notify  => Service['pe-httpd'],
+        notify  => Service[$pe_master_service],
       }
     MANIFEST
 
     manifest
   end
 
-  def gen_service
+  def gen_httpd
     manifest = <<-MANIFEST.gsub(/^\s{6}/, '')
-      service { 'pe-httpd':
+      $pe_master_service = 'pe-httpd'
+
+      service { "$pe_master_service":
+        ensure => running,
+      }
+    MANIFEST
+
+    manifest
+  end
+
+  def gen_puppetserver
+    manifest = <<-MANIFEST.gsub(/^\s{6}/, '')
+      $pe_master_service = 'pe-puppetserver'
+
+      service { "$pe_master_service":
         ensure => running,
       }
     MANIFEST

data/lib/pe_build/util/version_string.rb

@@ -0,0 +1,24 @@
+require 'rubygems/version'
+
+module PEBuild
+  module Util
+    # @api private
+    #
+    # @since 0.10.2
+    module VersionString
+
+      # Approximate comparison of two version strings using <=>
+      #
+      # Uses the Gem::Version class. Any nightly build tags, such as
+      # `-rc4-165-g9a98c9f`, will be stripped from the version.
+      #
+      # @param a [String] The first version string.
+      # @param b [String] The second version string.
+      #
+      # @return [Integer] A -1, 0 or 1.
+      def self.compare(a, b)
+        Gem::Version.new(a.split('-').first) <=> Gem::Version.new(b.split('-').first)
+      end
+    end
+  end
+end

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.10.1'
+  VERSION = '0.10.2'
 end

data/spec/shared/helpers/webserver_context.rb

@@ -1,4 +1,4 @@
-require 'webrick/https'
+require 'webrick'
 
 # This context runs a WEBRick server that is accessible to tests.
 # The `webserver_port` and `webserver_path` will need to be specified before

data/tasks/acceptance.rake

@@ -1,19 +1,19 @@
 namespace :acceptance do
   ARTIFACT_DIR = File.join('acceptance', 'artifacts')
-  TEST_BOXES = %w[
-    https://vagrantcloud.com/puppetlabs/centos-6.5-64-nocm/version/2/provider/virtualbox.box
-  ]
+  TEST_BOXES = {
+    'virtualbox.box' => 'https://s3.amazonaws.com/puppetlabs-vagrantcloud/centos-6.6-x86_64-virtualbox-nocm-1.0.1.box'
+  }
 
   directory ARTIFACT_DIR
-  TEST_BOXES.each do |box_url|
-    file File.join(ARTIFACT_DIR, File.basename(box_url)) => ARTIFACT_DIR do |path|
+  TEST_BOXES.each do |box, box_url|
+    file File.join(ARTIFACT_DIR, box) => ARTIFACT_DIR do |path|
       puts 'Downloading: ' + box_url
       Kernel.system 'curl', '-L', '-o', path.to_s, box_url
     end
   end
 
   desc 'downloads test boxes and other artifacts'
-  task :setup => TEST_BOXES.map {|box_url| File.join(ARTIFACT_DIR, File.basename(box_url))}
+  task :setup => TEST_BOXES.map {|box, _| File.join(ARTIFACT_DIR, box)}
 
   desc 'runs acceptance tests'
   task :run => :setup do

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '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: 
@@ -72,16 +72,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .rspec
+- .travis.yml
+- .yardopts
 - CHANGELOG
 - Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
-- acceptance/pe_build/pe_build_spec.rb
+- acceptance/pe_build/pe_bootstrap_3x_spec.rb
+- acceptance/pe_build/pe_bootstrap_latest_spec.rb
 - acceptance/skeletons/pe_build/Vagrantfile
 - acceptance/skeletons/pe_build/agent-3.x.txt.erb
 - doc/answers/README.markdown
@@ -146,6 +147,7 @@ files:
 - lib/pe_build/unpack/tar.rb
 - lib/pe_build/unpack/tar_gz.rb
 - lib/pe_build/util/config.rb
+- lib/pe_build/util/version_string.rb
 - lib/pe_build/util/versioned_path.rb
 - lib/pe_build/version.rb
 - lib/vagrant-pe_build.rb
@@ -178,19 +180,18 @@ 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.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Vagrant provisioner for installing Puppet Enterprise
 test_files: []
-has_rdoc: 

data/acceptance/pe_build/pe_build_spec.rb

@@ -1,50 +0,0 @@
-shared_examples 'provider/provisioner/pe_build' do |provider, options|
-  if !File.file?(options[:box])
-    raise ArgumentError,
-      "A box file must be downloaded for provider: #{provider}. Try: rake acceptance:setup"
-  end
-
-  include_context 'acceptance'
-
-  before(:each) do
-    environment.skeleton('pe_build')
-    assert_execute('vagrant', 'box', 'add', 'box', options[:box])
-  end
-
-  after(:each) do
-    # Ensure any VMs that survived tests are cleaned up.
-    assert_execute('vagrant', 'destroy', '--force', log: false)
-  end
-
-  context 'when download_root is set to a local directory' do
-    let(:extra_env) do
-      vars = options[:env_vars].dup
-      vars['PE_BUILD_DOWNLOAD_ROOT'] = options[:archive_path]
-
-      vars
-    end
-
-    it 'provisions with pe_build' do
-      assert_execute('vagrant', 'up', "--provider=#{provider}", 'explicit-version')
-      assert_execute('vagrant', 'up', "--provider=#{provider}", 'latest-version')
-    end
-  end
-
-  context 'when download_root is set to a webserver' do
-    let(:webserver_port) { 3838 }
-    let(:webserver_path) { options[:archive_path] }
-    include_context 'webserver'
-
-    let(:extra_env) do
-      vars = options[:env_vars].dup
-      vars['PE_BUILD_DOWNLOAD_ROOT'] = "http://localhost:#{webserver_port}/"
-
-      vars
-    end
-
-    it 'provisions with pe_build' do
-      assert_execute('vagrant', 'up', "--provider=#{provider}", 'explicit-version')
-      assert_execute('vagrant', 'up', "--provider=#{provider}", 'latest-version')
-    end
-  end
-end