vagrant-pe_build 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47561a70a1c02283bba9c70a97e051730f204fc4
-  data.tar.gz: 996f48ec7088af25312fecf60f7a1f841d541080
+  metadata.gz: e2e6f14e8b35e22ae15176f3cdf0c565e46c4e38
+  data.tar.gz: 361e059dc515938468056f519f041303901169d1
 SHA512:
-  metadata.gz: 9acee36342d28520e8fbc2266b7b1bfdc74bb8c52f59cb9ffcf5c11614a584c8ed1e34b0d077fd05d56e4253ebdc38e19a9c487e01f5bbe70804e8754c1900d6
-  data.tar.gz: d7c96302dc35a03ad6c08b7e63a62814c29c6338a161df39e73dcf3eedda49b4afc9feacc2c8f1585c4bbcf356755c61c4cf4d773b04421bc3626be76ebf1a2a
+  metadata.gz: 6b74826bbbde2c4a824fafa7fb021b6cc0f0f7078355087ae366a81e06f5f78790570c5123bc701355607bc8357c1686de9f2b2215b9b762042c6a96e69785ee
+  data.tar.gz: 54a2614a6218771ee590865ff44e772db378cc686af4756af69ba82266c14cbb67267d03783a244c87aa5e5d029249c54c3d6bb1bbbdd1e7d0f9bc6733511735

data/CHANGELOG

@@ -1,6 +1,23 @@
 vagrant-pe_build
 ================
 
+0.13.1
+------
+
+2015-10-25
+
+This is a backwards compatible bugfix release.
+
+  * (GH-100) Fixed an issue where the `pe_build` provisioner would fail
+    validation after provisioning had been executed. Some Vagrant providers
+    and plugins set up action chains that run validation multiple times.
+
+  * (GH-101) When loading facts, POSIX guests now properly search for
+    Puppet installations.
+
+  * (GH-102) Searches for Puppet installations are performed using the root
+    account and environment variables.
+
 0.13.0
 ------
 

data/lib/pe_build/cap/facts/base.rb

@@ -96,7 +96,7 @@ class PEBuild::Cap::Facts::Base
   # Override this method to implement a more sophisticated search for the
   # Puppet executable.
   def find_puppet
-    return 'puppet' if @machine.communicate.test('puppet --version')
+    return 'puppet' if @machine.communicate.test('puppet --version', :sudo => true)
     return nil
   end
 

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

@@ -19,7 +19,7 @@ class PEBuild::Cap::Facts::POSIX < PEBuild::Cap::Facts::Base
 
   private
 
-  def find_facter
+  def find_puppet
     paths = %w[
       /opt/puppetlabs/bin/puppet
       /opt/puppet/bin/puppet
@@ -27,7 +27,7 @@ class PEBuild::Cap::Facts::POSIX < PEBuild::Cap::Facts::Base
     ]
 
     paths.each do |path|
-      return path if @machine.communicate.test("#{path} --version")
+      return path if @machine.communicate.test("#{path} --version", :sudo => true)
     end
 
     return nil

data/lib/pe_build/provisioner/pe_agent.rb

@@ -12,13 +12,14 @@ module PEBuild
 
       attr_reader :facts
       attr_reader :agent_version
+      attr_reader :master_vm
 
       def provision
         provision_init!
 
         # As of 2015.x, pe_repo doesn't support windows installation, so skip
         # provisioning the repositories.
-        unless config.master_vm.nil? || provision_windows?
+        unless master_vm.nil? || provision_windows?
           provision_pe_repo
         end
         provision_agent
@@ -28,17 +29,17 @@ module PEBuild
       # This gets run during agent destruction and will remove the agent's
       # certificate from the master, if requested.
       def cleanup
-        unless config.master_vm.is_a?(::Vagrant::Machine)
-          vm_def = machine.env.active_machines.find {|vm| vm[0].to_s == config.master_vm.to_s}
-          if vm_def.nil?
-            config.master_vm.ui.warn I18n.t(
-              'pebuild.provisioner.pe_agent.skip_purge_no_master',
-              :master => config.master_vm.to_s
-            )
-            return
-          end
-          config.master_vm = machine.env.machine(*vm_def)
+        # Search the list of created VMs, which is a list of [name, provider]
+        # tuples. This will fail to match anything if config.master_vm is nil.
+        vm_def = machine.env.active_machines.find {|vm| vm[0].to_s == config.master_vm.to_s}
+        if vm_def.nil?
+          config.master_vm.ui.warn I18n.t(
+            'pebuild.provisioner.pe_agent.skip_purge_no_master',
+            :master => config.master_vm.to_s
+          )
+          return
         end
+        @master_vm = machine.env.machine(*vm_def)
 
         cleanup_agent_cert if config.autopurge
       end
@@ -55,8 +56,8 @@ module PEBuild
           vm_def = machine.env.active_machines.find {|vm| vm[0].to_s == config.master_vm.to_s}
 
           unless vm_def.nil?
-            config.master_vm = machine.env.machine(*vm_def)
-            config.master    ||= config.master_vm.config.vm.hostname.to_s
+            @master_vm       = machine.env.machine(*vm_def)
+            config.master    ||= @master_vm.config.vm.hostname.to_s
           end
         end
       end
@@ -94,7 +95,7 @@ module PEBuild
       def provision_pe_repo
         # This method will raise an error if commands can't be run on the
         # master VM.
-        ensure_reachable(config.master_vm)
+        ensure_reachable(master_vm)
 
         platform         = platform_tag(facts)
         # Transform the platform_tag into a Puppet class name.
@@ -104,18 +105,18 @@ module PEBuild
 
         # Print a message and return if the agent repositories exist on the
         # master.
-        if config.master_vm.communicate.test("[ -e #{platform_repo} ]")
-          config.master_vm.ui.info I18n.t(
+        if master_vm.communicate.test("[ -e #{platform_repo} ]", :sudo => true)
+          master_vm.ui.info I18n.t(
             'pebuild.provisioner.pe_agent.pe_repo_present',
-            :vm_name      => config.master_vm.name,
+            :vm_name      => master_vm.name,
             :platform_tag => platform
           )
           return
         end
 
-        config.master_vm.ui.info I18n.t(
+        master_vm.ui.info I18n.t(
           'pebuild.provisioner.pe_agent.adding_pe_repo',
-          :vm_name      => config.master_vm.name,
+          :vm_name      => master_vm.name,
           :platform_tag => platform
         )
 
@@ -129,7 +130,7 @@ module PEBuild
         EOS
         shell_config.finalize!
 
-        shell_provisioner = Vagrant.plugin('2').manager.provisioners[:shell].new(config.master_vm, shell_config)
+        shell_provisioner = Vagrant.plugin('2').manager.provisioners[:shell].new(master_vm, shell_config)
         shell_provisioner.provision
       end
 
@@ -181,7 +182,7 @@ bash pe_frictionless_installer.sh
       def provision_agent_cert
         # This method will raise an error if commands can't be run on the
         # master VM.
-        ensure_reachable(config.master_vm)
+        ensure_reachable(master_vm)
 
         agent_certname = facts['certname']
 
@@ -189,19 +190,19 @@ bash pe_frictionless_installer.sh
         # inverted as `grep -q` will exit with 1 if the certificate is not
         # found.
         # TODO: Extend paths to PE 3.x masters.
-        if not config.master_vm.communicate.test("/opt/puppetlabs/bin/puppet cert list | grep -q -F #{agent_certname}", :sudo => true)
-          config.master_vm.ui.info I18n.t(
+        if not master_vm.communicate.test("/opt/puppetlabs/bin/puppet cert list | grep -q -F #{agent_certname}", :sudo => true)
+          master_vm.ui.info I18n.t(
             'pebuild.provisioner.pe_agent.no_csr_pending',
             :certname => agent_certname,
-            :master   => config.master_vm.name.to_s
+            :master   => master_vm.name.to_s
           )
           return
         end
 
-        config.master_vm.ui.info I18n.t(
+        master_vm.ui.info I18n.t(
           'pebuild.provisioner.pe_agent.signing_agent_cert',
           :certname => agent_certname,
-          :master   => config.master_vm.name.to_s
+          :master   => master_vm.name.to_s
         )
 
         shell_config = Vagrant.plugin('2').manager.provisioner_configs[:shell].new
@@ -212,7 +213,7 @@ bash pe_frictionless_installer.sh
         EOS
         shell_config.finalize!
 
-        shell_provisioner = Vagrant.plugin('2').manager.provisioners[:shell].new(config.master_vm, shell_config)
+        shell_provisioner = Vagrant.plugin('2').manager.provisioners[:shell].new(master_vm, shell_config)
         shell_provisioner.provision
       end
 
@@ -221,28 +222,28 @@ bash pe_frictionless_installer.sh
         # point, so it's the best guess we have available.
         agent_certname = machine.config.vm.hostname
 
-        unless is_reachable?(config.master_vm)
-          config.master_vm.ui.warn I18n.t(
+        unless is_reachable?(master_vm)
+          master_vm.ui.warn I18n.t(
             'pebuild.provisioner.pe_agent.skip_purge_master_not_reachable',
-            :vm_name => config.master_vm.name.to_s
+            :vm_name => master_vm.name.to_s
           )
           return
         end
 
         # TODO: Extend paths to PE 3.x masters.
-        if not config.master_vm.communicate.test("/opt/puppetlabs/bin/puppet cert list #{agent_certname}", :sudo => true)
-          config.master_vm.ui.info I18n.t(
+        unless master_vm.communicate.test("/opt/puppetlabs/bin/puppet cert list #{agent_certname}", :sudo => true)
+          master_vm.ui.info I18n.t(
             'pebuild.provisioner.pe_agent.agent_purged',
             :certname => agent_certname,
-            :master   => config.master_vm.name.to_s
+            :master   => master_vm.name.to_s
           )
           return
         end
 
-        config.master_vm.ui.info I18n.t(
+        master_vm.ui.info I18n.t(
           'pebuild.provisioner.pe_agent.purging_agent',
           :certname => agent_certname,
-          :master   => config.master_vm.name.to_s
+          :master   => master_vm.name.to_s
         )
 
         shell_config = Vagrant.plugin('2').manager.provisioner_configs[:shell].new
@@ -253,7 +254,7 @@ bash pe_frictionless_installer.sh
         EOS
         shell_config.finalize!
 
-        shell_provisioner = Vagrant.plugin('2').manager.provisioners[:shell].new(config.master_vm, shell_config)
+        shell_provisioner = Vagrant.plugin('2').manager.provisioners[:shell].new(master_vm, shell_config)
         shell_provisioner.provision
       end
 

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.13.0'
+  VERSION = '0.13.1'
 end

data/spec/unit/provisioner/pe_agent_spec.rb

@@ -65,7 +65,7 @@ EOF
 
     context 'when master_vm is set' do
       before(:each) do
-        allow(config).to receive(:master_vm).and_return(master_vm)
+        allow(subject).to receive(:master_vm).and_return(master_vm)
       end
 
       it 'raises an error if the master_vm is unreachable' do
@@ -78,7 +78,7 @@ EOF
     context 'when osfamily is windows' do
       before(:each) do
         allow(subject).to receive(:provision_windows?).and_return(true)
-        allow(config).to receive(:master_vm).and_return(master_vm)
+        allow(subject).to receive(:master_vm).and_return(master_vm)
       end
 
       it 'invokes the windows provisioner and skips pe_repo' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Adrien Thebo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar