vagrant-pe_build 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faa7c9ee45abc5e36f92d3b66353e9f439c93e3a
-  data.tar.gz: defb7b188e664653f8a33dc09ea960e88b6c498e
+  metadata.gz: 2159e1da15e44aa5d1de8f16537342bb4d8912cb
+  data.tar.gz: 92df0b9ba7ed46d782b140de9489c49015a13594
 SHA512:
-  metadata.gz: 55e43d710eb6b842e9a9c77e25e02e5caed072ff1b458540f16b29356c2682a5970e627151ac8696cd7a4c96eaba67511ab09f453fb4380aa538bec027583b2e
-  data.tar.gz: ab0f79dc7cbbcb14a68fb500c36907812e4fafd02f4fa5095e631f5a9697fda74a35c0068fde056a77ab8f9050e98c3623c3e0ad16a947d460c92504929d0fc3
+  metadata.gz: 7b76f0571284c1f48f0ac85c16f73667d7b556fc12b5f703b0f4426f73d2c0c9665cc0e0ff13c8399fc0e2235e055433bf0a08879d9baa3f26d509e5f806a48d
+  data.tar.gz: 3d5fbd8965b42eb61749b799ccdecb611831dbac489f9128fefb24fcfd913dabd47ecc077536891f6ecefab04cb9b12c8d6eb53b4b89205a357c158ec0716754

data/CHANGELOG

@@ -1,6 +1,18 @@
 vagrant-pe_build
 ================
 
+0.19.1
+------
+
+2019-06-05
+
+This is a backwards compatible bugfix release.
+
+  * Fix the pe_agent provisioner to read and use the master's version number
+    instead of the agent's when determining how to provision and clean up
+    certificates.
+
+
 0.19.0
 ------
 
@@ -21,7 +33,6 @@ This is a backwards compatible feature release.
   * Add support for PE 2018.1.8
 
 
-
 0.18.2
 ------
 

data/lib/pe_build/provisioner/pe_agent.rb

@@ -190,6 +190,13 @@ bash pe_frictionless_installer.sh
         # This method will raise an error if commands can't be run on the
         # master VM.
         ensure_reachable(master_vm)
+        master_version = ''
+        err_code = master_vm.communicate.sudo('cat /opt/puppetlabs/server/pe_version', error_check: false) do |type, output|
+                     master_version << output if type == :stdout
+                   end
+        # Check for unrecognized PE file layouts, which are assumed to be older
+        # than 2019.0.
+        master_version = '0.0' if (err_code != 0)
 
         agent_certname = facts['certname']
 
@@ -197,7 +204,7 @@ 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.
-        csr_check = PEBuild::Util::VersionString.compare(config.version, '2019.0.0') < 0 ?
+        csr_check = PEBuild::Util::VersionString.compare(master_version, '2019.0') < 0 ?
             "/opt/puppetlabs/bin/puppet cert list | grep -q -F #{agent_certname}" :
             "/opt/puppetlabs/bin/puppetserver ca list | grep -q -F #{agent_certname}"
         if not master_vm.communicate.test(csr_check, :sudo => true)
@@ -217,7 +224,7 @@ bash pe_frictionless_installer.sh
 
         # TODO: Extend paths to PE 3.x masters.
         # NOTE: 2019.0.0 has Cert SAN allowed by default
-        sign_cert = PEBuild::Util::VersionString.compare(config.version, '2019.0.0') < 0 ?
+        sign_cert = PEBuild::Util::VersionString.compare(master_version, '2019.0') < 0 ?
             "/opt/puppetlabs/bin/puppet cert --allow-dns-alt-names sign #{agent_certname}" :
             "/opt/puppetlabs/bin/puppetserver ca sign --certname #{agent_certname}"
         shell_provision_commands(master_vm, sign_cert)
@@ -237,9 +244,17 @@ bash pe_frictionless_installer.sh
           return
         end
 
+        master_version = ''
+        err_code = master_vm.communicate.sudo('cat /opt/puppetlabs/server/pe_version', error_check: false) do |type, output|
+                     master_version << output if type == :stdout
+                   end
+        # Check for unrecognized PE file layouts, which are assumed to be older
+        # than 2019.0.
+        master_version = '0.0' if (err_code != 0)
+
         # TODO: Extend paths to PE 3.x masters.
         # TODO: Find a way to query an individual certificate through puppetserver ca.
-        cert_check = PEBuild::Util::VersionString.compare(config.version, '2019.0.0') < 0 ?
+        cert_check = PEBuild::Util::VersionString.compare(master_version, '2019.0') < 0 ?
             "/opt/puppetlabs/bin/puppet cert list #{agent_certname}" :
             "/opt/puppetlabs/bin/puppetserver ca list --all| grep -q -F #{agent_certname}"
         unless master_vm.communicate.test(cert_check, :sudo => true)

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.19.0'.freeze
+  VERSION = '0.19.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Adrien Thebo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar