vagrant-pe_build 0.4.2 → 0.4.3

data/CHANGELOG

@@ -1,6 +1,17 @@
 vagrant-pe_build
 ================
 
+0.4.3
+
+2013-09-09
+
+This is a backwards compatible bugfix release.
+
+  * (GH-27) Fully implement global pe_build options in pe_bootstrap config_builder model
+  * Standardize answer file variables across 2.x and 3.x for console password, listen port
+  * Add PE 2.8.3 to supported releases
+  * Trap network errors in transfer/openuri
+
 0.4.2
 -----
 

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

@@ -6,7 +6,7 @@ class PEBuild::Cap::RunInstall::POSIX
   def self.run_install(machine, config, archive)
 
     if machine.communicate.test('test -f /opt/puppet/pe_version')
-      machine.ui.warn I18n.t('pebuild.cap.run_install.posix.already_installed'),
+      machine.ui.warn I18n.t('pebuild.cap.run_install.already_installed'),
                       :name  => machine.name
       return
     end
@@ -28,7 +28,7 @@ class PEBuild::Cap::RunInstall::POSIX
 
 
     if machine.communicate.test('which at')
-      machine.ui.info I18n.t('pebuild.cap.run_install.posix.scheduling_run')
+      machine.ui.info I18n.t('pebuild.cap.run_install.scheduling_run')
       machine.communicate.sudo("echo '/opt/puppet/bin/puppet agent -t --waitforcert 10' | at next minute")
     end
   end

data/lib/pe_build/config_builder/global.rb

@@ -2,18 +2,24 @@ require 'config_builder/model'
 
 class PEBuild::ConfigBuilder::Global < ::ConfigBuilder::Model::Base
 
-  # @!attribute [rw] download_root
-  def_model_attribute :download_root
-
   # @!attribute [rw] version
+  #   @return [String] The version of Puppet Enterprise to install.
   def_model_attribute :version
 
   # @!attribute [rw] suffix
+  #   @return [String] The distribution specifix suffix of the Puppet
+  #     Enterprise installer to use.
   def_model_attribute :suffix
 
   # @!attribute [rw] filename
+  #   @return [String] The filename of the Puppet Enterprise installer.
   def_model_attribute :filename
 
+  # @!attribute [rw] download_root
+  #   @return [String] The URI to the directory containing Puppet Enterprise
+  #     installers if the installer is not yet cached. This setting is optional.
+  def_model_attribute :download_root
+
   def to_proc
     Proc.new do |global_config|
       global_config.pe_build.download_root = attr(:download_root) if attr(:download_root)

data/lib/pe_build/config_builder/pe_bootstrap.rb

@@ -2,24 +2,45 @@ require 'config_builder/model'
 
 class PEBuild::ConfigBuilder::PEBootstrap < ::PEBuild::ConfigBuilder::Global
 
-  def_model_attribute :master
-  def_model_attribute :answer_file
+  # @!attribute [rw] role
+  #   @return [Symbol] The role of the Puppet Enterprise install.
+  def_model_attribute :role
 
+  # @!attribute [rw] verbose
+  #   @return [Boolean] Whether or not to show the verbose output of the Puppet
+  #     Enterprise install.
   def_model_attribute :verbose
 
-  def_model_attribute :role
-  #def_model_attribute :step
+  # @!attribute [rw] master
+  #   @return [String] The address of the puppet master.
+  def_model_attribute :master
+
+  # @!attribute [rw] answer_file
+  #   @return [String] The location of alternate answer file for PE
+  #     installation. Values can be paths relative to the Vagrantfile's project
+  #     directory.
+  def_model_attribute :answer_file
+
+  # @!attribute [rw] relocate_manifests
+  #   @return [Boolean] Whether or not to change the PE master to use a config
+  #     of manifestdir=/manifests and modulepath=/modules. This is meant to be
+  #     used when the vagrant working directory manifests and modules are
+  #     remounted on the guest.
   def_model_attribute :relocate_manifests
 
   def to_proc
     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.suffix        = attr(:suffix)        if attr(:suffix)
         pe.filename      = attr(:filename)      if attr(:filename)
 
-        pe.role = attr(:role) if attr(:role)
+        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)
       end
     end

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

@@ -46,4 +46,8 @@ class PEBuild::Provisioner::PEBootstrap::AnswersFile
     template_data = File.read(@template)
     ERB.new(template_data).result(binding)
   end
+
+  def machine_hostname
+    @machine.config.vm.hostname || @machine.name
+  end
 end

data/lib/pe_build/release/2_8.rb

@@ -32,4 +32,5 @@ module PEBuild::Release
 
   @releases['2.8.1'] = two_eight_x
   @releases['2.8.2'] = two_eight_x
+  @releases['2.8.3'] = two_eight_x
 end

data/lib/pe_build/transfer/open_uri.rb

@@ -25,7 +25,7 @@ class PEBuild::Transfer::OpenURI
       tmpfile = download_file
       FileUtils.mv(tmpfile, @dst)
     end
-  rescue ::OpenURI::HTTPError => e
+  rescue ::OpenURI::HTTPError, ::OpenSSL::SSL::SSLError, ::SocketError => e
     raise DownloadFailed, :uri => @uri, :msg => e.message
   end
 

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/templates/answers/agent-2.x.txt.erb

@@ -2,7 +2,7 @@ q_install=y
 q_puppet_cloud_install=n
 q_puppet_enterpriseconsole_install=n
 q_puppet_symlinks_install=y
-q_puppetagent_certname=<%= @machine.name %>
+q_puppetagent_certname=<%= machine_hostname %>
 q_puppetagent_install=y
 q_puppetagent_server=<%= @config.master %>
 q_puppetmaster_install=n

data/templates/answers/agent-3.x.txt.erb

@@ -3,7 +3,7 @@ q_install=y
 q_puppet_cloud_install=n
 q_puppet_enterpriseconsole_install=n
 q_puppet_symlinks_install=y
-q_puppetagent_certname=<%= @machine.name %>
+q_puppetagent_certname=<%= machine_hostname %>
 q_puppetagent_install=y
 q_puppetagent_server=<%= @config.master %>
 q_puppetca_install=n

data/templates/answers/master-2.x.txt.erb

@@ -6,7 +6,7 @@ q_puppet_symlinks_install=y
 q_puppet_enterpriseconsole_auth_database_name=console_auth
 q_puppet_enterpriseconsole_auth_database_password=console_auth
 q_puppet_enterpriseconsole_auth_database_user=console_auth
-q_puppet_enterpriseconsole_auth_password=pe-console
+q_puppet_enterpriseconsole_auth_password=puppetlabs
 q_puppet_enterpriseconsole_auth_user_email=admin@puppetlabs.com
 
 q_puppet_enterpriseconsole_database_install=y
@@ -15,11 +15,11 @@ q_puppet_enterpriseconsole_database_user=console
 q_puppet_enterpriseconsole_database_password=tGNHTQAUl9mEkA8K5447
 q_puppet_enterpriseconsole_database_root_password=UHJn4CrTp5UgLnPJbDB5
 
-q_puppet_enterpriseconsole_httpd_port=20443
+q_puppet_enterpriseconsole_httpd_port=443
 q_puppet_enterpriseconsole_install=y
-q_puppet_enterpriseconsole_inventory_hostname=master
+q_puppet_enterpriseconsole_inventory_hostname=<%= machine_hostname %>
 q_puppet_enterpriseconsole_inventory_port=8140
-q_puppet_enterpriseconsole_master_hostname=master
+q_puppet_enterpriseconsole_master_hostname=<%= machine_hostname %>
 q_puppet_enterpriseconsole_smtp_host=localhost
 q_puppet_enterpriseconsole_smtp_password=
 q_puppet_enterpriseconsole_smtp_port=25
@@ -27,14 +27,14 @@ q_puppet_enterpriseconsole_smtp_use_tls=n
 q_puppet_enterpriseconsole_smtp_user_auth=n
 q_puppet_enterpriseconsole_smtp_username=
 
-q_puppetagent_certname=<%= @machine.name %>
+q_puppetagent_certname=<%= machine_hostname %>
 q_puppetagent_install=y
-q_puppetagent_server=<%= @machine.name %>
+q_puppetagent_server=<%= machine_hostname %>
 q_puppetca_install=y
-q_puppetmaster_certname=master
-q_puppetmaster_dnsaltnames=master,puppet
+q_puppetmaster_certname=<%= machine_hostname %>
+q_puppetmaster_dnsaltnames=<%= machine_hostname %>,puppet
 q_puppetmaster_enterpriseconsole_hostname=localhost
-q_puppetmaster_enterpriseconsole_port=20443
+q_puppetmaster_enterpriseconsole_port=443
 q_puppetmaster_install=y
 q_vendor_packages_install=y
 q_verify_packages=y

data/templates/answers/master-3.x.txt.erb

@@ -17,7 +17,7 @@ q_puppet_enterpriseconsole_database_password=aX5nCiKbkjKEBVzW0tCx
 q_puppet_enterpriseconsole_database_user=console
 q_puppet_enterpriseconsole_httpd_port=443
 q_puppet_enterpriseconsole_install=y
-q_puppet_enterpriseconsole_master_hostname=master
+q_puppet_enterpriseconsole_master_hostname=<%= machine_hostname %>
 q_puppet_enterpriseconsole_smtp_host=localhost
 q_puppet_enterpriseconsole_smtp_password=
 q_puppet_enterpriseconsole_smtp_port=25
@@ -25,17 +25,17 @@ q_puppet_enterpriseconsole_smtp_use_tls=n
 q_puppet_enterpriseconsole_smtp_user_auth=n
 q_puppet_enterpriseconsole_smtp_username=
 q_puppet_symlinks_install=y
-q_puppetagent_certname=<%= @machine.name %>
+q_puppetagent_certname=<%= machine_hostname %>
 q_puppetagent_install=y
-q_puppetagent_server=<%= @machine.name %>
+q_puppetagent_server=<%= machine_hostname %>
 q_puppetdb_database_name=pe-puppetdb
 q_puppetdb_database_password=MCPaKB0ERo0FlAN60sny
 q_puppetdb_database_user=pe-puppetdb
-q_puppetdb_hostname=<%= @machine.name %>
+q_puppetdb_hostname=<%= machine_hostname %>
 q_puppetdb_install=y
 q_puppetdb_port=8081
-q_puppetmaster_certname=<%= @machine.name %>
-q_puppetmaster_dnsaltnames=<%= @machine.name %>,puppet
+q_puppetmaster_certname=<%= machine_hostname %>
+q_puppetmaster_dnsaltnames=<%= machine_hostname %>,puppet
 q_puppetmaster_enterpriseconsole_hostname=localhost
 q_puppetmaster_enterpriseconsole_port=443
 q_puppetmaster_install=y

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar