simp-beaker-helpers 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjU0OTNiZTBhZDljMGNmYjU5ZWY1NjZmODA1NzY1MzhiMmJlZDdhMQ==
+    Mjc4ZGE2NjViYjJiOTgxOGQzNmMyMWFhM2E4MmY3NzFiM2FmZjUxYg==
   data.tar.gz: !binary |-
-    OGRhN2E4YWRkODg3NTgyOGIwMGI4YjExZjk2NjA0Y2RlOTlhYmI3Mg==
+    MGZkNzRhYzdmZDNlMmE5NjJiNzYwYWJjYWU0NmE1MmE0MWJjYjlhZg==
 SHA512:
   metadata.gz: !binary |-
-    NDE3YmY3NDliNDM5YmQ1MzlkMWEwMDA5ODhjNWJkYmE4MTk4NjdkNDMxMzE0
-    YzFiNmY5ZDUwYWJiOTlkOWVhZWIyZDQwZTEyMmY5OWJkNzZlYzg1N2RjMWRj
-    ODcxZTQyYjllMzM2OWMzZTYyY2UyZTk5MjAwYmQ2N2ZlYzNkNWQ=
+    MmZhZmM1MjNiYjY1NTc5N2FjN2EyZjBmNDY5Zjg2MDEyNjA3YjM1NTUzYTY5
+    MDdiNmY5NDdhN2FhODVhODRlNzk2MTRiMzcyYjg4MTk2ZGNmY2Q3NDg1Zjky
+    NmI4OTAyYjFkOTk2NmMxNjIzMTFiZDk0MmMwYzcyYmRmMTI4MTY=
   data.tar.gz: !binary |-
-    MjZlNzU1YzI4ZTkwYWYzNmI3N2IyYTNmYjIwYjcyNDIzOGU5MWEwYWIwMzNm
-    OWUzYjEzMGQ2ZGVmOTI1YWNmOGMxOGI3NGFmNGRlYzI1ZWFiNGQ5MzQ3Y2Fi
-    Y2Y5ZDBiMWFjOWQyYWE5YmI3OTJiZTAwMjgzMGQ2MzM4YmE5Y2M=
+    NTE4ZTdhMjg4NjJhNTQwYzQ1ZGNiYTAzNGRiZWRiMmIwNzBlOTNiYzFlMzM0
+    ZTQ2YTBhM2RiM2IzOWU2Zjg5YzVmZDg4YTFmMmQyNjI5YTk4YjM4OWI2OTc0
+    YzU5OTIwOGZjNTg0ZGQ1NjllZTlkMWFhZDc0ZTdiZTU1YWRmOGI=

data/README.md

@@ -77,14 +77,15 @@ Copy a single SUT's PKI certs (with cacerts) onto an SUT.  This simulates the re
 
 The directory structure copied to the SUT is:
 ```
-  HOST_PKI_DIR/
-          cacerts/cacerts.pem
-          public/fdqn.pub
-          private/fdqn.pem
+  SUT_BASE_DIR/
+              pki/
+                  cacerts/cacerts.pem
+                  public/fdqn.pub
+                  private/fdqn.pem
 
 ```
 
-`copy_pki_to(sut, local_pki_dir, sut_pki_dir = '/etc/pki/simp-testing')`
+`copy_pki_to(sut, local_pki_dir, sut_base_dir = '/etc/pki/simp-testing')`
 
 
 #### `copy_keydist_to`

data/lib/simp/beaker_helpers.rb

@@ -1,7 +1,7 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 
   # Locates .fixture.yml in or above this directory.
   def fixtures_yml_path
@@ -175,19 +175,21 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
   #
   # The directory structure is:
   #
-  # HOST_PKI_DIR/
-  #         cacerts/cacerts.pem
-  #         public/fdqn.pub
-  #         private/fdqn.pem
-  def copy_pki_to(sut, local_pki_dir, sut_pki_dir = '/etc/pki/simp-testing')
-      fqdn = fact_on(sut, 'fqdn')
-      local_host_pki_tree   = File.join(local_pki_dir,'pki','keydist',fqdn)
-      ###local_cacert_pki_tree = File.join(local_pki_dir,'pki','keydist','cacerts')
+  # SUT_BASE_DIR/
+  #             pki/
+  #                 cacerts/cacerts.pem
+  #                 public/fdqn.pub
+  #                 private/fdqn.pem
+  def copy_pki_to(sut, local_pki_dir, sut_base_dir = '/etc/pki/simp-testing')
+      fqdn                = fact_on(sut, 'fqdn')
+      sut_pki_dir         = File.join( sut_base_dir, 'pki' )
+      local_host_pki_tree = File.join(local_pki_dir,'pki','keydist',fqdn)
       local_cacert = File.join(local_pki_dir,'pki','demoCA','cacert.pem')
+
       on sut, %Q(mkdir -p "#{sut_pki_dir}/public" "#{sut_pki_dir}/private" "#{sut_pki_dir}/cacerts")
       scp_to(sut, "#{local_host_pki_tree}/#{fqdn}.pem",   "#{sut_pki_dir}/private/")
       scp_to(sut, "#{local_host_pki_tree}/#{fqdn}.pub",   "#{sut_pki_dir}/public/")
-      ###scp_to(sut, local_cacert_pki_tree, sut_pki_dir)
+
       # NOTE: to match pki::copy, 'cacert.pem' is renamed to 'cacerts.pem'
       scp_to(sut, local_cacert, "#{sut_pki_dir}/cacerts/cacerts.pem")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Chris Tessmer