vagrant-pe_build 0.3.0 → 0.4.0

data/.gitignore

@@ -0,0 +1 @@
+/doc

data/CHANGELOG

@@ -1,6 +1,35 @@
 vagrant-pe_build
 ================
 
+0.4.0
+-----
+
+This is a backwards compatible feature and bugfix release.
+
+### User notes:
+
+#### Enhancements
+
+  * New pe_bootstrap configuration option: `autosign` adds the ability to
+    configure the Puppet master autosign.conf
+
+#### Bugfixes
+
+  * The pe_bootstrap provisioner restarts the pe-httpd service if changes were
+    made to the master configuration that require a restart.
+
+### Developer notes:
+
+  * pe_bootstrap post-install configuration has been extracted out of the
+    provisioner and into the PostInstall module.
+  * post-install configuration is now handled by generating a Puppet manifest
+    instead of executing sed and a shell script.
+
+### Thanks
+
+Thanks to Tom Linkin for his work on handling post-install configuration with
+Augeas and Puppet.
+
 0.3.0
 -----
 

data/Gemfile

@@ -1,3 +1,15 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :doc do
+  gem 'yard', '~> 0.8.7'
+  gem 'redcarpet'
+end
+
+group :development do
+  # We depend on Vagrant for development, but we don't add it as a
+  # gem dependency because we expect to be installed within the
+  # Vagrant environment itself using `vagrant plugin`.
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+end

data/README.markdown

@@ -168,8 +168,7 @@ added with `vagrant pe-build copy`.
       config.vm.define 'agent1' do |node|
         node.vm.box = 'centos-6-i386'
 
-        node.vm.provision :pe_bootstrap do |provisioner|
-          provisioner.role = :agent end
+        node.vm.provision :pe_bootstrap
       end
     end
 

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

@@ -5,6 +5,12 @@ 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'),
+                      :name  => machine.name
+      return
+    end
+
     root = File.join('/vagrant', PEBuild::WORK_DIR)
 
     cmd_path = []
@@ -20,7 +26,10 @@ class PEBuild::Cap::RunInstall::POSIX
 
     on_machine(machine, argv)
 
-    machine.ui.info I18n.t('pebuild.provisioner.pe_bootstrap.scheduling_run')
-    machine.communicate.sudo("echo '/opt/puppet/bin/puppet agent -t' | at next minute")
+
+    if machine.communicate.test('which at')
+      machine.ui.info I18n.t('pebuild.provisioner.pe_bootstrap.scheduling_run')
+      machine.communicate.sudo("echo '/opt/puppet/bin/puppet agent -t --waitforcert 10' | at next minute")
+    end
   end
 end

data/lib/pe_build/config.rb

@@ -0,0 +1,8 @@
+require 'pe_build/config_default'
+
+module PEBuild
+  module Config
+    require 'pe_build/config/global'
+    require 'pe_build/config/pe_bootstrap'
+  end
+end

data/lib/pe_build/config/global.rb

@@ -1,13 +1,9 @@
-require 'uri'
-require 'vagrant'
-
 require 'pe_build/config_default'
 require 'pe_build/transfer'
 
-module PEBuild
-module Config
+require 'uri'
 
-class Global < Vagrant.plugin('2', :config)
+class PEBuild::Config::Global < Vagrant.plugin('2', :config)
 
   # @todo This value should be discovered based on what versions of the
   #       installer are cached.
@@ -57,32 +53,48 @@ class Global < Vagrant.plugin('2', :config)
   def validate(machine)
     errors = []
 
+    validate_version(errors)
+    validate_download_root(errors)
+
+    {"PE build global config" => errors}
+  end
+
+  private
+
+  def validate_version(version)
+
+    errmsg = I18n.t(
+      'pebuild.config.global.errors.malformed_version',
+      :version       => @version,
+      :version_class => @version.class
+    )
+
     # Allow Global version to be unset, rendering it essentially optional. If it is
     # discovered to be unset by a configuration on the next level up who cannot provide a
     # value, it is that configuration's job to take action.
-    if @version.kind_of? String
-      unless @version.match /\d+\.\d+(\.\d+)?/
-        errors << "version must be a valid version string, got #{@version.inspect}"
-      end
+    if @version.kind_of? String and !(@version.match /\d+\.\d+(\.\d+)?/)
+      errors << errmsg
     elsif @version != UNSET_VALUE
-      errors << "version only accepts a string, got #{@version.class}"
+      errors << errmsg
     end
+  end
 
+  def validate_download_root(errors)
     if @download_root and @download_root != UNSET_VALUE
       begin
         uri = URI.parse(@download_root)
 
         if PEBuild::Transfer::IMPLEMENTATIONS[uri.scheme].nil?
-          errors << "No handlers available for URI scheme #{uri.scheme}"
+          errors << I18n.t(
+            'pebuild.config.global.errors.unhandled_download_root_scheme',
+            :download_root => @download_root,
+            :scheme        => uri.scheme,
+            :supported     => PEBuild::Transfer::IMPLEMENTATIONS.keys
+          )
         end
       rescue URI::InvalidURIError
-        errors << 'download_root must be a valid URL or nil'
+        errors << I18n.t('pebuild.config.global.errors.invalid_download_root_uri')
       end
     end
-
-    {"PE Build global config" => errors}
   end
 end
-
-end
-end

data/lib/pe_build/config/pe_bootstrap.rb

@@ -1,42 +1,59 @@
-require 'vagrant'
-
 require 'pe_build/config/global'
-require 'pe_build/config_default'
-
-module PEBuild
-module Config
 
-class PEBootstrap < PEBuild::Config::Global
+class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
 
   # @!attribute master
-  #   @return The DNS hostname of the Puppet master for this node.
+  #   @return [String] The DNS hostname of the Puppet master for this node.
+  #   @since 0.1.0
   attr_accessor :master
 
   # @!attribute answer_file
   #   @return [String] The path to a user specified answer_file file (Optional)
+  #   @since 0.1.0
   attr_accessor :answer_file
 
   # @!attribute verbose
   #   @return [TrueClass, FalseClass] if stdout will be displayed when installing
+  #   @since 0.1.0
   attr_accessor :verbose
 
   # @!attribute role
   #   @return [Symbol] The type of the PE installation role. One of [:master, :agent]
+  #   @since 0.1.0
   attr_accessor :role
+
+  # @api private
   VALID_ROLES = [:agent, :master]
 
   # @!attribute step
   #   @return [Hash<Symbol, String>] a hash whose keys are step levels, and whose
   #                                  keys are directories to optional steps.
+  #   @deprecated This duplicates the behavior of the shell provider and will
+  #               be removed in a future release.
+  #   @since 0.1.0
   attr_accessor :step
 
-  attr_accessor :relocate_manifests
   # @!attribute relocate_manifests
   #   @return [TrueClass, FalseClass] if the puppet master should use manifests
   #                                   out of the vagrant directory.
+  #   @since 0.1.0
+  attr_accessor :relocate_manifests
 
-  # @todo config option for autosigning.
-  #attr_accessor :autosign
+  # @!attribute [rw] autosign
+  #   Configure the certificates that will be autosigned by the puppet master.
+  #
+  #   @return [TrueClass] All CSRs will be signed
+  #   @return [FalseClass] The autosign config file will be unmanaged
+  #   @return [Array<String>] CSRs with the given addresses
+  #
+  #   @see http://docs.puppetlabs.com/guides/configuring.html#autosignconf
+  #
+  #   @since 0.4.0
+  #
+  attr_accessor :autosign
+
+  # @api private
+  VALID_AUTOSIGN_VALUES = [TrueClass, FalseClass, Array]
 
   def initialize
     super
@@ -47,7 +64,7 @@ class PEBootstrap < PEBuild::Config::Global
 
     @relocate_manifests = UNSET_VALUE
 
-    #@autosign    = UNSET_VALUE
+    @autosign = UNSET_VALUE
 
     @step    = {}
   end
@@ -64,53 +81,101 @@ class PEBootstrap < PEBuild::Config::Global
     set_default :@verbose,     true
     set_default :@master,      'master'
     set_default :@answer_file, nil
+    set_default :@autosign,    (@role == :master)
 
     set_default :@relocate_manifests, false
   end
 
+  # @deprecated This duplicates the behavior of the shell provider and will
+  #             be removed in a future release.
   def add_step(name, script_path)
     name = (name.is_a?(Symbol)) ? name : name.intern
     step[name] = script_path
   end
 
-  # @todo Convert error strings to I18n
+  # @param machine [Vagrant::Machine]
   def validate(machine)
     h = super
 
     unless @step.empty?
-      machine.ui.warn "pe_bootstrap: explicit steps are deprecated and will be removed soon."
+      machine.ui.warn I18n.t('pebuild.config.pe_bootstrap.steps_deprecated')
     end
 
     errors = []
+
+    validate_version(errors)
+    validate_role(errors)
+    validate_verbose(errors)
+    validate_master(errors)
+    validate_answer_file(errors)
+    validate_relocate_manifests(errors)
+    validate_autosign(errors)
+
+    errors |= h.values.flatten
+    {"PE Bootstrap" => errors}
+  end
+
+  private
+
+  def validate_version(errors)
     if @version == UNSET_VALUE and global_config_from(machine).pe_build.version == UNSET_VALUE
-      errors << "Version must be set on provisioner when unset globally"
+      errors << I18n.t('pebuild.config.pe_bootstrap.errors.unset_version')
     end
+  end
 
+  def validate_role(errors)
     unless VALID_ROLES.any? {|sym| @role == sym}
-      errors << "Role must be one of #{VALID_ROLES.inspect}, was #{@role.inspect}"
+      errors << I18n.t(
+        'pebuild.config.pe_bootstrap.errors.unhandled_role',
+        :role        => @role.inspect,
+        :known_roles => VALID_ROLES,
+      )
     end
+  end
 
+  def validate_verbose(errors)
     unless @verbose == !!@verbose
-      errors << "'verbose' must be a boolean, got #{@verbose.class}"
+      errors << I18n.t(
+        'pebuild.config.pe_bootstrap.errors.malformed_verbose',
+        :verbose => @verbose.inspect,
+      )
     end
+  end
 
+  def validate_master(errors)
     unless @master.is_a? String
       errors << "'master' must be a string containing the address of the master, got a #{@master.class}"
     end
+  end
 
+  def validate_answer_file(errors)
     if @answer_file and !File.readable? @answer_file
       errors << "'answers_file' must be a readable file"
     end
+  end
 
+  def validate_relocate_manifests(errors)
     if @relocate_manifests and not @role == :master
       errors << "'relocate_manifests' can only be applied to a master"
     end
-
-    errors |= h.values.flatten
-    {"PE Bootstrap" => errors}
   end
 
-  private
+  def validate_autosign(errors)
+    if (@autosign and @role != :master)
+      errors << I18n.t(
+        'pebuild.config.pe_bootstrap.errors.invalid_autosign_role',
+        :role => @role
+      )
+    end
+
+    unless VALID_AUTOSIGN_VALUES.include?(@autosign.class)
+      errors << I18n.t(
+        'pebuild.config.pe_bootstrap.errors.invalid_autosign_class',
+        :autosign_class   => @autosign.class,
+        :autosign_classes => VALID_AUTOSIGN_VALUES,
+      )
+    end
+  end
 
   # Safely access the global config
   #
@@ -121,5 +186,3 @@ class PEBootstrap < PEBuild::Config::Global
     env = machine.env.config_global
   end
 end
-end
-end

data/lib/pe_build/config_builder.rb

@@ -0,0 +1,6 @@
+module PEBuild
+  module ConfigBuilder
+    require 'pe_build/config_builder/global'
+    require 'pe_build/config_builder/pe_bootstrap'
+  end
+end

data/lib/pe_build/config_builder/global.rb

@@ -0,0 +1,37 @@
+require 'config_builder/model'
+
+class PEBuild::ConfigBuilder::Global < ::ConfigBuilder::Model::Base
+
+  # @!attribute [rw] download_root
+  def_model_attribute :download_root
+
+  # @!attribute [rw] version
+  def_model_attribute :version
+
+  # @!attribute [rw] suffix
+  def_model_attribute :suffix
+
+  # @!attribute [rw] filename
+  def_model_attribute :filename
+
+  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.suffix        = attr(:suffix)        if attr(:suffix)
+      global_config.pe_build.filename      = attr(:filename)      if attr(:filename)
+    end
+  end
+end
+
+class ConfigBuilder::Model::Root
+  def_model_delegator :pe_build
+
+  def eval_pe_build(root_config)
+    if attr(:pe_build)
+      p = PEBuild::ConfigBuilder::Global.new_from_hash(attr(:pe_build))
+      p.call(root_config)
+    end
+  end
+  private :eval_pe_build
+end

data/lib/pe_build/config_builder/pe_bootstrap.rb

@@ -0,0 +1,29 @@
+require 'config_builder/model'
+
+class PEBuild::ConfigBuilder::PEBootstrap < ::PEBuild::ConfigBuilder::Global
+
+  def_model_attribute :master
+  def_model_attribute :answer_file
+
+  def_model_attribute :verbose
+
+  def_model_attribute :role
+  #def_model_attribute :step
+  def_model_attribute :relocate_manifests
+
+  def to_proc
+    Proc.new do |vm_config|
+      vm_config.provision :pe_bootstrap do |pe|
+        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.relocate_manifests = attr(:relocate_manifests) if attr(:relocate_manifests)
+      end
+    end
+  end
+
+  ::ConfigBuilder::Model::Provisioner.register('pe_bootstrap', self)
+end

data/lib/pe_build/plugin.rb

@@ -18,12 +18,12 @@ module PEBuild
     # User facing plugin configuration
 
     config(:pe_bootstrap, :provisioner) do
-      require_relative 'config/pe_bootstrap'
+      require_relative 'config'
       PEBuild::Config::PEBootstrap
     end
 
     config(:pe_build) do
-      require_relative 'config/global'
+      require_relative 'config'
       PEBuild::Config::Global
     end
 
@@ -70,5 +70,9 @@ module PEBuild
       require 'pe_build/action'
       hook.prepend PEBuild::Action::PEBuildDir
     end
+
+    def self.config_builder_hook
+      require_relative 'config_builder'
+    end
   end
 end

data/lib/pe_build/provisioner/pe_bootstrap.rb

@@ -11,6 +11,7 @@ module PEBuild
     class PEBootstrap < Vagrant.plugin('2', :provisioner)
 
       require 'pe_build/provisioner/pe_bootstrap/answers_file'
+      require 'pe_build/provisioner/pe_bootstrap/post_install'
 
       # @!attribute [r] work_dir
       #   @return [String] The path to the machine pe_build working directory
@@ -53,8 +54,9 @@ module PEBuild
 
         [:base, @config.role].each { |rolename| process_step rolename, :pre }
 
-        perform_installation
-        relocate_installation if @config.relocate_manifests
+        @machine.guest.capability('run_install', @config, @archive)
+
+        run_postinstall_tasks
 
         [:base, @config.role].each { |rolename| process_step rolename, :post }
       end
@@ -100,6 +102,9 @@ module PEBuild
         @archive.unpack_to(@work_dir)
       end
 
+      require 'pe_build/on_machine'
+      include PEBuild::OnMachine
+
       def process_step(role, stepname)
 
         if role != :base && config.step[stepname]
@@ -125,44 +130,13 @@ module PEBuild
           template = File.read(template_path)
           contents = ERB.new(template).result(binding)
 
-          on_remote contents
+          on_machine(@machine, contents)
         end
       end
 
-      def perform_installation
-        if @machine.communicate.test('test -f /opt/puppet/pe_version')
-          @machine.ui.warn I18n.t('pebuild.provisioner.pe_bootstrap.already_installed'),
-            :name  => @machine.name
-        else
-          @machine.guest.capability('run_install', @config, @archive)
-        end
-      end
-
-      # Modify the PE puppet master config to use alternate /manifests and /modules
-      #
-      # Manifests and modules need to be mounted on the master via shared folders,
-      # but the default /vagrant mount has permissions and ownership that conflicts
-      # with the puppet master process and the pe-puppet user. Those directories
-      # need to be mounted with permissions like 'fmode=644,dmode=755,fmask=022,dmask=022'
-      #
-      def relocate_installation
-        script_path = File.join(PEBuild.template_dir, 'scripts', 'relocate_installation.sh')
-        script = File.read script_path
-        on_remote script
-      end
-
-      def on_remote(cmd)
-        @machine.communicate.sudo(cmd) do |type, data|
-          if type == :stdout
-            if @config.verbose
-              @machine.ui.info(data.chomp, :color => :green, :prefix => true)
-            else
-              @machine.ui.info('.', :color => :green)
-            end
-          else
-            @machine.ui.info(data.chomp, :color => :red, :prefix => true)
-          end
-        end
+      def run_postinstall_tasks
+        postinstall = PostInstall.new(@machine, @config, @work_dir)
+        postinstall.run
       end
     end
   end

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

@@ -0,0 +1,108 @@
+require 'pe_build/on_machine'
+
+class PEBuild::Provisioner::PEBootstrap::PostInstall
+
+  def initialize(machine, config, work_dir)
+    @machine, @config = machine, config
+
+    @post_install_dir = Pathname.new(File.join(work_dir, 'post-install'))
+    @post_install_manifest = @post_install_dir.join("#{@machine.name}.pp")
+  end
+
+  include PEBuild::OnMachine
+
+  def run
+    if needs_post_install?
+      @machine.ui.info I18n.t('pebuild.provisioner.pe_bootstrap.post_install')
+
+      resources = []
+
+      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"
+      manifest_path = "/vagrant/.pe_build/post-install/#{@machine.name}.pp"
+
+      on_machine(@machine, "#{puppet_apply} #{manifest_path}")
+    end
+  end
+
+  private
+
+  def write_manifest(manifest)
+    @post_install_dir.mkpath unless @post_install_dir.exist?
+    @post_install_manifest.open('w') { |fh| fh.write(manifest) }
+  end
+
+  def needs_post_install?
+    !!(@config.relocate_manifests or @config.autosign)
+  end
+
+  def gen_relocate
+    manifest = <<-MANIFEST.gsub(/^\s{6}/, '')
+      augeas { 'move_manifestdir':
+        changes => 'set etc/puppetlabs/puppet/puppet.conf/main/manifestdir /manifests',
+        notify  => Service['pe-httpd'],
+      }
+
+      # 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'],
+      }
+
+      # Rewrite the olde site.pp config since it's not used, and warn people
+      # about this.
+      file { 'old_site.pp':
+        ensure  => file,
+        path    => '/etc/puppetlabs/puppet/manifests/site.pp',
+        content => '# /etc/puppetlabs/puppet/manifests is not used; see /manifests.',
+        notify  => Service['pe-httpd'],
+      }
+    MANIFEST
+
+    manifest
+  end
+
+  def gen_autosign
+
+    autosign_entries = ['pe-internal-dashboard', @machine.name ]
+
+    case @config.autosign
+    when TrueClass
+      autosign_entries << '*'
+    when Array
+      autosign_entries += @config.autosign
+    end
+
+    autosign_content = autosign_entries.map { |line| "#{line}\n" }.join
+
+    manifest = <<-MANIFEST.gsub(/^\s{6}/, '')
+      file { '/etc/puppetlabs/puppet/autosign.conf':
+        ensure  => file,
+        content => "#{autosign_content}",
+        owner   => 'root',
+        group   => 'pe-puppet',
+        mode    => '0644',
+        notify  => Service['pe-httpd'],
+      }
+    MANIFEST
+
+    manifest
+  end
+
+  def gen_service
+    manifest = <<-MANIFEST.gsub(/^\s{6}/, '')
+      service { 'pe-httpd':
+        ensure => running,
+      }
+    MANIFEST
+
+    manifest
+  end
+end

data/lib/pe_build/transfer.rb

@@ -1,5 +1,10 @@
 module PEBuild
   module Transfer
+
+    class UnhandledURIScheme < Vagrant::Errors::VagrantError
+      error_key('unhandled_uri_scheme', 'pebuild.transfer')
+    end
+
     require 'pe_build/transfer/open_uri'
     require 'pe_build/transfer/file'
 
@@ -17,7 +22,8 @@ module PEBuild
       if (klass = IMPLEMENTATIONS[scheme])
         klass.new(src, dst)
       else
-        raise "URI scheme #{scheme.inspect} cannot be handled by any file transferrers"
+        raise UnhandledURIScheme, :scheme => scheme,
+                                  :supported => IMPLEMENTATIONS.keys
       end
     end
   end

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/templates/locales/en.yml

@@ -13,8 +13,41 @@ en:
           Puppet Enterprise is already installed, skipping installation.
         scheduling_run: |-
           Scheduling Puppet run to kickstart node classification.
+        post_install: |-
+          Applying post-install configuration to Puppet Enterprise.
     transfer:
       open_uri:
         download_failed: |-
           An error occurred while trying to download the given resource (%{uri}),
           and the transfer could not complete. The error message generated was "%{msg}".
+      unhandled_uri_scheme: |-
+        The URI scheme "%{scheme}" cannot be handled by any file transferrers.
+        Supported URI schemes: %{supported}
+    config:
+      global:
+        errors:
+          malformed_version: |-
+            The Puppet Enterprise version "%{version}":%{version_class} is malformed; it must be a String of
+            the format "x.y.z"
+          unhandled_download_root_scheme: |-
+            The URI scheme "%{scheme}" for the download_root "%{download_root}"
+            cannot be handled by any file transferrers.
+            Supported URI schemes: %{supported}
+          invalid_download_root_uri: |-
+            The download_root config option must be either unset or a valid URI.
+      pe_bootstrap:
+        steps_deprecated: |-
+          Explicit :pre, :provision, and :post steps are deprecated and will be removed soon.
+          This functionality can be replaced by directly invoking the `shell` provisioner. More
+          information on the shell provisioner can be found on the Vagrant website at
+          http://docs.vagrantup.com/v2/provisioning/shell.html
+        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.
+          unknown_role: |-
+            The specified role %{role} is unhandled, must be one of %{known_roles}.
+          invalid_autosign_role: |-
+            Autosign can only be specified if the pe_bootstrap role is 'master', not %{role}.
+          invalid_autosign_class: |-
+            Autosign must be one of %{autosign_classes}, but was of type %{autosign}.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
@@ -49,6 +49,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -76,14 +77,19 @@ files:
 - lib/pe_build/command/copy.rb
 - lib/pe_build/command/download.rb
 - lib/pe_build/command/list.rb
+- lib/pe_build/config.rb
 - lib/pe_build/config/global.rb
 - lib/pe_build/config/pe_bootstrap.rb
+- lib/pe_build/config_builder.rb
+- lib/pe_build/config_builder/global.rb
+- lib/pe_build/config_builder/pe_bootstrap.rb
 - lib/pe_build/config_default.rb
 - lib/pe_build/idempotent.rb
 - lib/pe_build/on_machine.rb
 - lib/pe_build/plugin.rb
 - lib/pe_build/provisioner/pe_bootstrap.rb
 - lib/pe_build/provisioner/pe_bootstrap/answers_file.rb
+- lib/pe_build/provisioner/pe_bootstrap/post_install.rb
 - lib/pe_build/release.rb
 - lib/pe_build/release/2_0.rb
 - lib/pe_build/release/2_5.rb
@@ -104,7 +110,6 @@ files:
 - templates/answers/master-2.x.txt.erb
 - templates/answers/master-3.x.txt.erb
 - templates/locales/en.yml
-- templates/scripts/relocate_installation.sh
 - vagrant-pe_build.gemspec
 homepage: https://github.com/adrienthebo/vagrant-pe_build
 licenses:

data/templates/scripts/relocate_installation.sh

@@ -1,23 +0,0 @@
-# Update puppet.conf to add the manifestdir directive to point to the
-# /manifests mount, if the directive isn't already present.
-sed -i '
-2 {
-/manifest/ !i\
-    manifestdir = /manifests
-}
-' /etc/puppetlabs/puppet/puppet.conf
-
-# Update puppet.conf to add the modulepath directive to point to the
-# /module mount, if it hasn't already been set.
-sed -i '
-/modulepath/ {
-/vagrant/ !s,$,:/modules,
-}
-' /etc/puppetlabs/puppet/puppet.conf
-
-# Rewrite the olde site.pp config since it's not used, and warn people
-# about this.
-echo '# /etc/puppetlabs/puppet/manifests is not used; see /manifests.' > /etc/puppetlabs/puppet/manifests/site.pp
-
-# Enable autosigning on the master
-echo '*' > /etc/puppetlabs/puppet/autosign.conf