simp-beaker-helpers 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a867ae9f1b572aab3ab4c9cc5b31a9e36b006d5
-  data.tar.gz: 7f057b0c8985000cee0f7a64ca55b44cb6fe6bdb
+  metadata.gz: 4956f5f8e1a5a81d0f8daeb6ee58c54516756b96
+  data.tar.gz: e45cc0c1a5f3a609d049755994fdd2fc72edfd40
 SHA512:
-  metadata.gz: 1c6ddedd94aebe0539e7ff54afdd6378f4ebc7523527dd3398f9db95709ed6dbc5fc49c931c9cb84fa049fb3baca6e781b8a1c004fe25f1d3026d1a007709ab0
-  data.tar.gz: 7993446042b193c5131100fb9379a394399ecbf3b8ce433d71ad8d7d4f27d91e98e2ca12bd605ceb7e7b3ce212d9c2d1098b591e3010e4bc1a63c86a84b49357
+  metadata.gz: 087b061992ae56669a7600eebe9562ed1fe5dc24333506aa367bf28d24f028f2d2f163e76e45b51a890060588a47a40f55a6ee4b5602ce3b04aaaf00f99e5103
+  data.tar.gz: 4e96ebc13c03aa9c54bf75bb1a7f45db7ffd688f0518ba0a98c5419b2be546f510c31731f11a289d40cae50142158afb8962b504f77afe9c4b31374443363e6e

data/README.md

@@ -117,12 +117,27 @@ Nodes in your nodesets will create YUM repository entries according to the
 following Hash:
 
 ```yaml
+---
+yum_repos:
+   <repo_name>:
+     <yum_resource_parameter>: <value>
+```
+
+The `baseurl` and `gpgkey` parameters can also take an Array if you need to
+point at more than one location.
+
+This would look like the following:
+
+```yaml
+---
 yum_repos:
    <repo_name>:
-     url: <URL>
-     gpgkeys:
-       - <URL to GPGKEY1>
-       - <URL to GPGKEY2>
+     baseurl:
+       - http://some.random.host
+       - https://some.other.random.host
+     gpgkey:
+       - https://my.gpg.host
+       - https://my.other.gpg.host
 ```
 
 ## Methods

data/lib/simp/beaker_helpers.rb

@@ -1,7 +1,7 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 
   # use the `puppet fact` face to look up facts on an SUT
   def pfact_on(sut, fact_name)
@@ -187,15 +187,73 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
   #       - <URL to GPGKEY1>
   #       - <URL to GPGKEY2>
   def enable_yum_repos_on( suts = hosts )
+    repo_attrs = [
+      :assumeyes,
+      :bandwidth,
+      :cost,
+      :deltarpm_metadata_percentage,
+      :deltarpm_percentage,
+      :descr,
+      :enabled,
+      :enablegroups,
+      :exclude,
+      :failovermethod,
+      :gpgcakey,
+      :gpgcheck,
+      :http_caching,
+      :include,
+      :includepkgs,
+      :keepalive,
+      :metadata_expire,
+      :metalink,
+      :mirrorlist,
+      :mirrorlist_expire,
+      :priority,
+      :protect,
+      :provider,
+      :proxy,
+      :proxy_password,
+      :proxy_username,
+      :repo_gpgcheck,
+      :retries,
+      :s3_enabled,
+      :skip_if_unavailable,
+      :sslcacert,
+      :sslclientcert,
+      :sslclientkey,
+      :sslverify,
+      :target,
+      :throttle,
+      :timeout
+    ]
+
     Array(suts).each do |sut|
       if sut['yum_repos']
         sut['yum_repos'].each_pair do |repo, metadata|
-          repo_manifest = <<-EOS
-            yumrepo { #{repo}:
-              baseurl => '#{metadata[:url]}',
-              gpgkey => '#{metadata[:gpgkeys].join(" ")}'
-            }
-          EOS
+          repo_manifest = %(yumrepo { #{repo}:)
+
+          repo_manifest_opts = []
+
+          # Legacy Support
+          urls = !metadata[:url].nil? ? metadata[:url] : metadata[:baseurl]
+          if urls
+            repo_manifest_opts << 'baseurl => ' + '"' + Array(urls).flatten.join('\n        ').gsub('$','\$') + '"'
+          end
+
+          # Legacy Support
+          gpgkeys = !metadata[:gpgkeys].nil? ? metadata[:gpgkeys] : metadata[:gpgkey]
+          if gpgkeys
+            repo_manifest_opts << 'gpgkey => ' + '"' + Array(gpgkeys).flatten.join('\n       ').gsub('$','\$') + '"'
+          end
+
+          repo_attrs.each do |attr|
+            if metadata[attr]
+              repo_manifest_opts << "#{attr} => '#{metadata[attr]}'"
+            end
+          end
+
+          repo_manifest = repo_manifest + %(\n#{repo_manifest_opts.join(",\n")}) + "\n}"
+
           apply_manifest_on(sut, repo_manifest, :catch_failures => true)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -87,4 +87,3 @@ test_files:
 - spec/acceptance/nodesets/default.yml
 - spec/acceptance/pki_tests_spec.rb
 - spec/spec_helper_acceptance.rb
-has_rdoc: