beaker-puppet 1.18.3 → 1.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b54c4287a80e22ffd30f5a96d7a11b74d300344b
-  data.tar.gz: fe37eed2b606c9848c7f115c769f468716449faf
+  metadata.gz: 19e3a488a55a067142bea66fbb51a448f8662c8e
+  data.tar.gz: c11281acd5f33ef8b81fe7ca90ecdde000524fc4
 SHA512:
-  metadata.gz: 9e8fb91f8776ce8849a48d490861ca1b76171a73f30f04908872ab07acc57e9a145c30ea588e117b08fc5bf457bb9e926968faac7d1dc70b72ed2e3590dc05b1
-  data.tar.gz: a59b3c974bfb563e87702b7999ef21a77982a376dbb0e1baed39beaf22811ac70789a3836de04d6d278a0db0f488787518242cc7d8321ecddd1a4739e71b4901
+  metadata.gz: 461fc2c6313c31ce031dc98d2971a890d86a61cf0c276a351fff6feab0894312b574ec6752c83fdf7abe5a41fa7de5d5652fe3127dacdbf5d48f90c945bc97b3
+  data.tar.gz: 231b18953b0433b3569d49baeb951cb84b83df05f5fbc95e1fe14cc447175a8f9aa57c799c3995460925ed8155505ab56eafb128fff3521d9a5e12a999249576

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.18.3'
+  VERSION = '1.18.4'
 end

data/setup/common/040_ValidateSignCert.rb

@@ -19,11 +19,17 @@ test_name "Validate Sign Cert" do
     on(host, "rm -rf '#{ssldir}/*'")
   end
 
+  step "Set 'server' setting"
+  hosts.each do |host|
+    on(host, puppet("config set server #{master.hostname} --section main"))
+  end
+
   step "Start puppetserver" do
     master_opts = {
       main: {
         dns_alt_names: "puppet,#{hostname},#{fqdn}",
-        server: fqdn
+        server: fqdn,
+        autosign: true
       },
     }
 
@@ -32,23 +38,8 @@ test_name "Validate Sign Cert" do
       on master, 'puppetserver ca setup'
     end
     with_puppet_running_on(master, master_opts) do
-      agents.each do |agent|
-        next if agent == master
-
-        step "Agents: Run agent --test first time to gen CSR"
-        on agent, puppet("agent --test --server #{master}"), :acceptable_exit_codes => [1]
-      end
-
-      # Sign all waiting agent certs
-      step "Server: sign all agent certs"
-      if version_is_less(puppet_version, "5.99")
-        on master, puppet("cert sign --all"), :acceptable_exit_codes => [0, 24]
-      else
-        on master, 'puppetserver ca sign --all', :acceptable_exit_codes => [0, 24]
-      end
-
-      step "Agents: Run agent --test second time to obtain signed cert"
-      on agents, puppet("agent --test --server #{master}"), :acceptable_exit_codes => [0,2]
+      step "Agents: Run agent --test with autosigning enabled to get cert"
+      on agents, puppet("agent --test"), :acceptable_exit_codes => [0,2]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.18.3
+  version: 1.18.4
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec