vagrant-pe_build 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4778faea056b72d7efa8e448ee61c66ce849561c
-  data.tar.gz: 165615da44e5bb376e24de346a4f70fe3a2e44de
+  metadata.gz: 74737936d5c81404d14bdffed7e5e2e09bfd8509
+  data.tar.gz: eee7a5b8e6c304c4c30f29d38b69d300ae6bb9e9
 SHA512:
-  metadata.gz: 62addde25c53aca92e18d0c9cf63f144c97b102c22bbfd446b736e25e2696e8293f6e9dde77f31d185e90831a293a03fdfbc21d861e53d0d83dc160c200731c9
-  data.tar.gz: aaf115ae03a83af59fdc5413e32791df1adb344bf7495e1cb9db5b3df5a4cd8eb9080f33ebd849f506a2f0583a3e56624494e9af755a6c9867c1aa3340d57f72
+  metadata.gz: 1289a74c813df50dc247c925c7880e5a83d142c3eb54c0640393dc18e8d4cd1a07eae7be218183d5e3d745114810d4a42cc9b609221e828f31539c1ef4cbea9f
+  data.tar.gz: bb9a03e99eb021c2079d29f421c7e8bbff9c12768b74910189bdebd138ed1c0d1cec9c1b93af66690c8b7fa93a222d704d69895b95bfd903388dfa142b31e90f

data/CHANGELOG

@@ -1,6 +1,22 @@
 vagrant-pe_build
 ================
 
+0.15.0
+------
+
+2016-05-11
+
+This is a backwards incompatible feature release.
+
+  * (GH-95) *Breaking change* Using the pe_bootstrap provisioner to install
+    is deprecated for 2015.2.0 and newer and raises an error starting with
+    2016.2.0. Agent installs should be transitioned to the pe_agent
+    provisioner.
+
+  * (GH-116) Starting with PE 2016.2.0, the new PEM installer is used to
+    install Puppet Masters. Answer files for this installer should be
+    written in HOCON format instead of bash format.
+
 0.14.2
 ------
 

data/README.markdown

@@ -55,8 +55,10 @@ can be overridden at this point.
 
   * `role`
     * Description: The role of the Puppet Enterprise install.
-    * Options: `:agent`, `:master`
-    * Default: `:agent`
+    * Options: `:agent`, `:master`. `:agent` has been deprecated starting with
+      PE 2015.2.0 and is no longer valid for PE 2016.2.0 having been replaced
+      by a dedicated `pe_agent` provisioner described below.
+    * Default: `:agent` for PE < 2016.2.0 and `:master` for PE >= 2016.2.0.
   * `verbose`
     * Description: Whether or not to show the verbose output of the Puppet
       Enterprise install.

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 15.04 15.10]
+    %w[10.04 12.04 14.04 15.04 15.10 16.04]
   end
 
   def arch

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

@@ -5,13 +5,46 @@ class PEBuild::Cap::RunInstall::POSIX
 
   # Run the PE installer on POSIX systems
   #
+  # @param machine [Vagrant::Machine] The Vagrant machine on which to run the
+  #   installation.
   # @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.
+  # @option options [Boolean] A flag which controls whether the PEM installer
+  #   introduced in 2016.2 should be used.
   #
   # @return [void]
-  def self.run_install(machine, installer_path, answers)
-    on_machine(machine, "#{installer_path} -a #{answers}")
+  def self.run_install(machine, installer_path, answers, **options)
+    if options.fetch(:use_pem, false)
+      # NOTE: Ensure symlinks exist since minitar doesn't create them. This
+      # call will be reverted once the PEM changes are finalized.
+      on_machine(machine, <<-EOS)
+pushd #{File.dirname(installer_path)} > /dev/null
+if [ -d pe-manager ]
+then
+  pushd pe-manager > /dev/null
+  ln -sf ../VERSION ../modules .
+  pushd packages > /dev/null
+  ln -sf ../../packages/* .
+fi
+EOS
+      on_machine(machine, "#{installer_path} -c #{answers}")
+    else
+      # NOTE: Ensure symlinks exist since minitar doesn't create them. This
+      # call will be reverted once the PEM changes are finalized.
+      on_machine(machine, <<-EOS)
+pushd #{File.dirname(installer_path)} > /dev/null
+if [ -d legacy ]
+then
+  pushd legacy > /dev/null
+  for f in $(find . -type f -empty)
+  do
+    ln -sf ../$f $f
+  done
+fi
+EOS
+      on_machine(machine, "#{installer_path} -a #{answers}")
+    end
 
     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

@@ -5,12 +5,14 @@ class PEBuild::Cap::RunInstall::Windows
 
   # Run the PE installer on Windows systems
   #
+  # @param machine [Vagrant::Machine] The Vagrant machine on which to run the
+  #   installation.
   # @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)
+  def self.run_install(machine, installer_path, answers, **options)
     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('/', '\\')

data/lib/pe_build/config/pe_bootstrap.rb

@@ -74,7 +74,7 @@ class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
   #   global configuration; it's assumed that the late configuration merging in
   #   the provisioner will handle that.
   def finalize!
-    set_default :@role,        :agent
+    set_default :@role,        nil
     set_default :@verbose,     true
     set_default :@master,      'master'
     set_default :@answer_file, nil
@@ -89,7 +89,7 @@ class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
     #
     # We also need to run this after a default was set, otherwise we'll try to
     # normalize UNSET_VALUE
-    @role = @role.intern
+    @role = @role.intern unless @role.nil?
   end
 
   # @param machine [Vagrant::Machine]
@@ -113,6 +113,10 @@ class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
   private
 
   def validate_role(errors, machine)
+    # A nil default is handled later on by the provisioner implementation after
+    # version information from the global config is merged in.
+    return if @role.nil?
+
     unless VALID_ROLES.any? {|sym| @role == sym.intern}
       errors << I18n.t(
         'pebuild.config.pe_bootstrap.errors.unknown_role',

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

@@ -10,6 +10,8 @@ require 'erb'
 # @api private
 class PEBuild::Provisioner::PEBootstrap::AnswersFile
 
+  attr_reader :template
+
   # @param machine [Vagrant::Machine]
   # @param config [Object < Vagrant.plugin('2', :config)]
   # @param work_dir [String]
@@ -48,7 +50,7 @@ class PEBuild::Provisioner::PEBootstrap::AnswersFile
       @template = @config.answer_file
       mode = 'explicit'
     else
-      release_info = PEBuild::Release[@config.version]
+      release_info = PEBuild::Release[@config.version.split('-').first]
 
       @template = release_info.answer_file(@config.role)
       mode = 'default'

data/lib/pe_build/provisioner/pe_bootstrap.rb

@@ -3,6 +3,7 @@ require 'vagrant'
 require 'pe_build/archive'
 require 'pe_build/util/config'
 require 'pe_build/util/versioned_path'
+require 'pe_build/util/version_string'
 
 require 'log4r'
 require 'fileutils'
@@ -20,6 +21,10 @@ module PEBuild
         error_key(:unset_version, 'pebuild.provisioner.pe_bootstrap.errors')
       end
 
+      class AgentRoleRemovedError < Vagrant::Errors::VagrantError
+        error_key(:agent_role_removed, 'pebuild.provisioner.pe_bootstrap.errors')
+      end
+
       # @!attribute [r] work_dir
       #   @return [String] The path to the machine pe_build working directory
 
@@ -53,6 +58,7 @@ module PEBuild
           FileUtils.mkdir_p work_dir
         end
       end
+
       def provision
         load_archive
 
@@ -93,21 +99,8 @@ module PEBuild
         global.finalize!
         provision.finalize!
 
-        merged = PEBuild::Util::Config.local_merge(provision, global)
-
-        @config = merged
-      end
-
-      def prepare_answers_file
-        af = AnswersFile.new(@machine, @config, @work_dir)
-        af.generate
+        @config = PEBuild::Util::Config.local_merge(provision, global)
 
-        unless @config.shared_installer
-          @machine.communicate.upload(File.join(@answer_dir, "#{@machine.name}.txt"), "#{machine.name}.txt")
-        end
-      end
-
-      def load_archive
         # If a version file is set, use its contents to specify the PE version.
         unless @config.version_file.nil?
           if URI.parse(@config.version_file).scheme.nil?
@@ -122,6 +115,33 @@ module PEBuild
 
         raise UnsetVersionError if @config.version.nil?
 
+        if (PEBuild::Util::VersionString.compare(@config.version, '2016.2.0') >= 0)
+          @config.role ||= :master
+        else
+          @config.role ||= :agent
+        end
+
+        if (@config.role == :agent) &&
+          (PEBuild::Util::VersionString.compare(@config.version, '2016.2.0') >= 0)
+          raise AgentRoleRemovedError, machine_name: @machine.name
+        elsif (@config.role == :agent) &&
+          (PEBuild::Util::VersionString.compare(@config.version, '2015.2.0') >= 0)
+          @machine.ui.warn I18n.t(
+            'pebuild.provisioner.pe_bootstrap.warnings.agent_role_deprecated',
+            machine_name: @machine.name)
+        end
+      end
+
+      def prepare_answers_file
+        @answer_template = AnswersFile.new(@machine, @config, @work_dir)
+        @answer_template.generate
+
+        unless @config.shared_installer
+          @machine.communicate.upload(File.join(@answer_dir, "#{@machine.name}.txt"), "#{machine.name}.txt")
+        end
+      end
+
+      def load_archive
         if @config.suffix == :detect and @config.filename.nil?
           filename = @machine.guest.capability('detect_installer', @config.version)
         else
@@ -161,6 +181,8 @@ module PEBuild
             'PUPPET_MASTER_SERVER'  => @config.master,
             'PUPPET_AGENT_CERTNAME' => machine.name,
           }
+
+          use_pem = false
         else
           if @config.shared_installer
             root = File.join('/vagrant', PEBuild::WORK_DIR)
@@ -170,9 +192,17 @@ module PEBuild
             installer_path = File.join(@archive.installer_dir, 'puppet-enterprise-installer')
             answers = File.join("#{machine.name}.txt")
           end
+
+          # Run a PEM install if the PE version is 2016.2.0 or newer and the
+          # answer file template ends in .conf.
+          #
+          # NOTE: The check for the template file ending may be dropped when
+          # 2016.2.0 final builds are shipped.
+          use_pem = (PEBuild::Util::VersionString.compare(@config.version, '2016.2.0') >= 0) &&
+            File.basename(@answer_template.template, '.erb').end_with?('.conf')
         end
 
-        machine.guest.capability('run_install', installer_path, answers)
+        machine.guest.capability('run_install', installer_path, answers, use_pem: use_pem)
       end
 
       def run_postinstall_tasks

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

@@ -2,7 +2,7 @@ require 'pe_build/release'
 
 module PEBuild::Release
 
-  twentyfifteen_six_x = newrelease do
+  twentysixteen_one_x = newrelease do
 
     add_release :el, '6'
     add_release :el, '7'
@@ -25,6 +25,7 @@ module PEBuild::Release
     set_answer_file :agent,  File.join(PEBuild.template_dir, 'answers', 'agent-2015.x.txt.erb')
   end
 
-  @releases['2016.1.0'] = twentyfifteen_six_x
-  @releases['2016.1.1'] = twentyfifteen_six_x
+  @releases['2016.1.0'] = twentysixteen_one_x
+  @releases['2016.1.1'] = twentysixteen_one_x
+  @releases['2016.1.2'] = twentysixteen_one_x
 end

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

@@ -0,0 +1,30 @@
+require 'pe_build/release'
+
+module PEBuild::Release
+
+  twentysixteen_two_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 :ubuntu, '16.04'
+
+    add_release :windows, '2008'
+    add_release :windows, '2008R2'
+    add_release :windows, '2012'
+    add_release :windows, '2012R2'
+    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['2016.2.0'] = twentysixteen_two_x
+end

data/lib/pe_build/release.rb

@@ -40,7 +40,8 @@ module PEBuild
     require 'pe_build/release/2015_2'
     require 'pe_build/release/2015_3'
     require 'pe_build/release/2016_1'
+    require 'pe_build/release/2016_2'
 
-    LATEST_VERSION = '2016.1.1'
+    LATEST_VERSION = '2016.1.2'
   end
 end

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.14.2'
+  VERSION = '0.15.0'
 end

data/templates/answers/master-2016.2.x.conf.erb

@@ -0,0 +1,14 @@
+# Stock all-in-one answers for 2016.2.x and newer
+"console_admin_password": "puppetlabs"
+"puppet_enterprise::certificate_authority_host": "%{::trusted.certname}"
+"puppet_enterprise::puppet_master_host": "%{::trusted.certname}"
+"puppet_enterprise::console_host": "%{::trusted.certname}"
+"puppet_enterprise::puppetdb_host": "%{::trusted.certname}"
+"puppet_enterprise::database_host": "%{::trusted.certname}"
+"puppet_enterprise::pcp_broker_host": "%{::trusted.certname}"
+"puppet_enterprise::mcollective_middleware_hosts": ["%{::trusted.certname}"]
+"puppet_enterprise::puppetdb_database_password": "1ZIhBXimu65wZtXpvMpj"
+"puppet_enterprise::classifier_database_password": "mrwelwaywblIGYjpdHAa"
+"puppet_enterprise::activity_database_password": "HsguT8FOfLgcQ8dpTus9"
+"puppet_enterprise::rbac_database_password": "qfNllIKXaOYRaGt2ZIKU"
+"puppet_enterprise::orchestrator_database_password": "kjhasdASDljhfjhkasd"

data/templates/locales/en.yml

@@ -30,10 +30,23 @@ en:
           Applying post-install configuration to Puppet Enterprise.
         already_installed: |-
           Puppet Enterprise is already installed, skipping installation.
+        warnings:
+          agent_role_deprecated: |-
+            Agent-only installations from PE tarballs are deprecated starting
+            with PE 2015.2.0 and will stop working in 2016.2.0. The pe_bootstrap
+            provisioner on the following machine is configured for agent
+            installation and should be replaced with a pe_agent provisioner:
+              %{machine_name}
         errors:
           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.
+          agent_role_removed: |-
+            Agent-only installations from PE tarballs are no longer supported
+            starting with PE 2016.2.0. The pe_bootstrap provisioner on the
+            following machine is configured for agent installation and should
+            be replaced with a pe_agent provisioner:
+              %{machine_name}
       pe_agent:
         already_installed: |-
           Puppet agent %{version} is already installed, skipping installation.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Adrien Thebo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
@@ -152,6 +152,7 @@ files:
 - 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/2016_2.rb
 - lib/pe_build/release/2_0.rb
 - lib/pe_build/release/2_5.rb
 - lib/pe_build/release/2_6.rb
@@ -197,6 +198,7 @@ files:
 - templates/answers/master-2.0.x.txt.erb
 - templates/answers/master-2.x.txt.erb
 - templates/answers/master-2015.x.txt.erb
+- templates/answers/master-2016.2.x.conf.erb
 - templates/answers/master-3.x.txt.erb
 - templates/locales/en.yml
 - vagrant-pe_build.gemspec