vagrant-pe_build 0.0.2 → 0.0.3

data/README.markdown

@@ -45,8 +45,8 @@ configure VMs with semi-sane DNS.
 Contact
 -------
 
-  * Source code: https://github.com/adrienthebo/puppet-network
-  * Issue tracker: https://github.com/adrienthebo/puppet-network/issues
+  * Source code: https://github.com/adrienthebo/vagrant-pe\_build
+  * Issue tracker: https://github.com/adrienthebo/vagrant-pe\_build/issues
 
 If you have questions or concerns about this module, contact finch on #vagrant
 on Freenode, or email adrien@puppetlabs.com.

data/lib/pe_build.rb

@@ -6,7 +6,7 @@ module PEBuild
   end
 
   def self.source_root
-    @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    @source_root ||= File.expand_path('..', File.dirname(__FILE__))
   end
 end
 

data/lib/pe_build/action/download.rb

@@ -28,7 +28,7 @@ class PEBuild::Action::Download
     if @env[:box_name]
       @root     = @env[:vm].pe_build.download_root
       @version  = @env[:vm].pe_build.version
-      @filename = @env[:vm].pe_build.version
+      @filename = @env[:vm].pe_build.filename
     end
 
     @root     ||= @env[:global_config].pe_build.download_root

data/lib/pe_build/command/list.rb

@@ -2,7 +2,7 @@ require 'vagrant'
 class PEBuild::Command::List < Vagrant::Command::Base
   def execute
     if File.directory? PEBuild.archive_directory and (entries = Dir["#{PEBuild.archive_directory}/*"])
-      puts entries.join('\n')
+      puts entries.join("\n")
     else
       warn "No PE versions downloaded."
     end

data/lib/pe_build/config.rb

@@ -6,6 +6,7 @@ class PEBuild::Config < Vagrant::Config::Base
   attr_writer :download_root
   attr_writer :version
   attr_writer :filename
+  attr_writer :suffix
 
   def download_root
     @download_root
@@ -19,6 +20,10 @@ class PEBuild::Config < Vagrant::Config::Base
     @filename
   end
 
+  def suffix
+    @suffix || :all
+  end
+
   def validate(env, errors)
     URI.parse(download_root)
   rescue

data/lib/pe_build/provisioners/puppet_enterprise_bootstrap.rb

@@ -7,7 +7,7 @@ require 'erb'
 class PEBuild::Provisioners::PuppetEnterpriseBootstrap < Vagrant::Provisioners::Base
 
   class Config < Vagrant::Config::Base
-    attr_writer :verbose, :master
+    attr_writer :verbose, :master, :answers
 
     def role=(rolename)
       @role = (rolename.is_a?(Symbol)) ? rolename : rolename.intern
@@ -25,8 +25,27 @@ class PEBuild::Provisioners::PuppetEnterpriseBootstrap < Vagrant::Provisioners::
       @master || 'master'
     end
 
+    def answers
+      # Either the path the user provided to the answers file under
+      # the project answers dir, or see if one exists based on the role.
+      @answers || "#{role}.txt"
+    end
+
+    def step
+      @step || @step = {}
+    end
+
+    def add_step(name, script_path)
+      name = (name.is_a?(Symbol)) ? name : name.intern
+      step[name] = script_path
+    end
+
     def validate(env, errors)
       errors.add("role must be one of [:master, :agent]") unless [:master, :agent].include? role
+
+      step.keys.each do |key|
+        errors.add("step name :#{key.to_s} is invalid, must be one of [:pre, :provision, :post]") unless [:pre, :provision, :post].include? key
+      end
     end
   end
 
@@ -60,7 +79,7 @@ class PEBuild::Provisioners::PuppetEnterpriseBootstrap < Vagrant::Provisioners::
 
     [:pre, :provision, :post].each do |stepname|
       [:base, config.role].each do |rolename|
-        step rolename, stepname
+        process_step rolename, stepname
       end
     end
   end
@@ -73,19 +92,28 @@ class PEBuild::Provisioners::PuppetEnterpriseBootstrap < Vagrant::Provisioners::
       @root     = @env[:vm].pe_build.download_root
       @version  = @env[:vm].pe_build.version
       @filename = @env[:vm].pe_build.version
+      @suffix   = @env[:vm].pe_build.suffix
     end
 
     @root     ||= @env[:global_config].pe_build.download_root
     @version  ||= @env[:global_config].pe_build.version
     @filename ||= @env[:global_config].pe_build.filename
+    @suffix   ||= @env[:global_config].pe_build.suffix
   end
 
   def prepare_answers_file
-    FileUtils.mkdir_p @answers_dir unless File.directory? @answers_dir
     @env[:ui].info "Creating answers file, node:#{@env[:vm].name}, role: #{config.role}"
-
-    template = File.read("#{PEBuild.source_root}/templates/answers/#{config.role}.txt.erb")
-    dest     = "#{@answers_dir}/#{@env[:vm].name}.txt"
+    FileUtils.mkdir_p @answers_dir unless File.directory? @answers_dir
+    dest = "#{@answers_dir}/#{@env[:vm].name}.txt"
+
+    # answers dir is enforced
+    user_answers = File.join(@env[:root_path],"answers/#{config.answers}")
+    if File.exists?(user_answers)
+      template = File.read(user_answers)
+    else
+      @env[:ui].info "Using default answers, no answers file available at #{user_answers}"
+      template = File.read("#{PEBuild.source_root}/templates/answers/#{config.role}.txt.erb")
+    end
 
     contents = ERB.new(template).result(binding)
 
@@ -95,15 +123,28 @@ class PEBuild::Provisioners::PuppetEnterpriseBootstrap < Vagrant::Provisioners::
     end
   end
 
-  def step(role, stepname)
-    script_dir  = File.join(PEBuild.source_root, 'bootstrap', role.to_s, stepname.to_s)
-    script_list = Dir.glob("#{script_dir}/*")
+  def process_step(role, stepname)
+
+    if role != :base && config.step[stepname]
+      if File.file? config.step[stepname]
+        script_list = [*config.step[stepname]]
+      else
+        script_list = []
+        @env[:ui].warn "Cannot find defined step for #{role}/#{stepname.to_s} at \'#{config.step[stepname]}\'"
+      end
+    else
+      # We do not have a user defined step for this role or we're processing the :base step
+      script_dir  = File.join(PEBuild.source_root, 'bootstrap', role.to_s, stepname.to_s)
+      script_list = Dir.glob("#{script_dir}/*")
+    end
 
     if script_list.empty?
       @env[:ui].info "No steps for #{role}/#{stepname}", :color => :cyan
     end
 
     script_list.each do |template_path|
+      # A message to show which step's action is running
+      @env[:ui].info "Running action for #{role}/#{stepname}"
       template = File.read(template_path)
       contents = ERB.new(template).result(binding)
 
@@ -112,11 +153,9 @@ class PEBuild::Provisioners::PuppetEnterpriseBootstrap < Vagrant::Provisioners::
   end
 
   # Determine the proper invocation of the PE installer
-  #
-  # @todo Don't restrict this to the universal installer
   def configure_installer
     vm_base_dir = "/vagrant/.pe_build"
-    installer   = "#{vm_base_dir}/puppet-enterprise-#{@version}-all/puppet-enterprise-installer"
+    installer   = "#{vm_base_dir}/puppet-enterprise-#{@version}-#{@suffix}/puppet-enterprise-installer"
     answers     = "#{vm_base_dir}/answers/#{@env[:vm].name}.txt"
     log_file    = "/root/puppet-enterprise-installer-#{Time.now.strftime('%s')}.log"
 

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/templates/answers/master-existing-db.txt.erb

@@ -0,0 +1,52 @@
+q_install=y
+q_puppet_cloud_install=n
+
+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=console
+q_puppet_enterpriseconsole_auth_user_email=console@example.com
+
+# Use existing database
+q_puppet_enterpriseconsole_database_install=n
+q_puppet_enterpriseconsole_setup_db=y
+
+q_puppet_enterpriseconsole_database_name=console
+q_puppet_enterpriseconsole_database_user=console
+q_puppet_enterpriseconsole_database_password=console
+q_puppet_enterpriseconsole_database_remote=n
+q_puppet_enterpriseconsole_database_root_password=console
+
+q_puppet_enterpriseconsole_httpd_port=443
+q_puppet_enterpriseconsole_install=y
+
+q_puppet_enterpriseconsole_inventory_hostname=master
+q_puppet_enterpriseconsole_inventory_port=8140
+
+q_puppet_enterpriseconsole_master_hostname=master
+
+q_puppet_enterpriseconsole_smtp_host=smtp.google.com
+q_puppet_enterpriseconsole_smtp_password=
+q_puppet_enterpriseconsole_smtp_port=25
+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=<%= @env[:vm].name %>
+q_puppetagent_install=y
+q_puppetagent_server=<%= @env[:vm].name %>
+q_puppetca_install=y
+q_puppetmaster_certname=master
+q_puppetmaster_dnsaltnames=master,puppet
+q_puppetmaster_enterpriseconsole_hostname=localhost
+q_puppetmaster_enterpriseconsole_port=443
+q_puppetmaster_forward_facts=n
+q_puppetmaster_install=y
+q_vendor_packages_install=y
+
+# pe 2.0 option
+q_puppet_enterpriseconsole_auth_user=console
+
+# pe 2.0 - 2.5 upgrade options
+q_puppet_enterpriseconsole_setup_auth_db=y

data/templates/answers/master.txt.erb

@@ -1,38 +1,32 @@
 q_install=y
 q_puppet_cloud_install=n
+q_puppet_enterpriseconsole_setup_db=n
+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=console
-q_puppet_enterpriseconsole_auth_user_email=console@example.com
-
-# Use existing database
-q_puppet_enterpriseconsole_database_install=n
-q_puppet_enterpriseconsole_setup_db=y
+q_puppet_enterpriseconsole_auth_password=pe-console
+q_puppet_enterpriseconsole_auth_user_email=admin@puppetlabs.com
 
+q_puppet_enterpriseconsole_database_install=y
 q_puppet_enterpriseconsole_database_name=console
 q_puppet_enterpriseconsole_database_user=console
-q_puppet_enterpriseconsole_database_password=console
-q_puppet_enterpriseconsole_database_remote=n
-q_puppet_enterpriseconsole_database_root_password=console
+q_puppet_enterpriseconsole_database_password=tGNHTQAUl9mEkA8K5447
+q_puppet_enterpriseconsole_database_root_password=UHJn4CrTp5UgLnPJbDB5
 
-q_puppet_enterpriseconsole_httpd_port=443
+q_puppet_enterpriseconsole_httpd_port=20443
 q_puppet_enterpriseconsole_install=y
-
 q_puppet_enterpriseconsole_inventory_hostname=master
 q_puppet_enterpriseconsole_inventory_port=8140
-
 q_puppet_enterpriseconsole_master_hostname=master
-
-q_puppet_enterpriseconsole_smtp_host=smtp.google.com
+q_puppet_enterpriseconsole_smtp_host=localhost
 q_puppet_enterpriseconsole_smtp_password=
 q_puppet_enterpriseconsole_smtp_port=25
 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=<%= @env[:vm].name %>
 q_puppetagent_install=y
 q_puppetagent_server=<%= @env[:vm].name %>
@@ -40,13 +34,7 @@ q_puppetca_install=y
 q_puppetmaster_certname=master
 q_puppetmaster_dnsaltnames=master,puppet
 q_puppetmaster_enterpriseconsole_hostname=localhost
-q_puppetmaster_enterpriseconsole_port=443
-q_puppetmaster_forward_facts=n
+q_puppetmaster_enterpriseconsole_port=20443
 q_puppetmaster_install=y
 q_vendor_packages_install=y
-
-# pe 2.0 option
-q_puppet_enterpriseconsole_auth_user=console
-
-# pe 2.0 - 2.5 upgrade options
-q_puppet_enterpriseconsole_setup_auth_db=y
+q_verify_packages=y

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
@@ -58,6 +58,7 @@ files:
 - lib/pe_build/version.rb
 - lib/vagrant_init.rb
 - templates/answers/agent.txt.erb
+- templates/answers/master-existing-db.txt.erb
 - templates/answers/master.txt.erb
 - vagrant-pe_build.gemspec
 homepage: https://github.com/adrienthebo/vagrant-pe_build