diff --git a/Gemfile b/Gemfile
index 722e7fa59..8667eb9be 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,9 +6,9 @@ group :rake do
   gem 'rake',         '>=0.9.2.2'
   gem 'puppet-lint',  '>=0.1.12'
   gem 'puppetlabs_spec_helper'
-  gem 'puppet-blacksmith'
+  gem 'puppet-blacksmith', '>= 3.0.0'
   gem 'librarian-puppet-maestrodev'
-  gem 'rspec-system-puppet',     :require => false
+  gem 'rspec-system-puppet', '>= 2.2.1', :require => false
   gem 'serverspec',              :require => false
-  gem 'rspec-system-serverspec', :require => false
+  gem 'rspec-system-serverspec', '>= 1.0.1', :require => false
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index d78d90213..76f12a2aa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,177 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    builder (3.2.2)
-    diff-lcs (1.2.4)
-    facter (1.7.1)
-    hiera (1.2.1)
-      json_pure
-    highline (1.6.19)
+    CFPropertyList (2.3.6)
+    base64 (0.3.0)
+    builder (3.3.0)
+    concurrent-ruby (1.3.5)
+    deep_merge (1.2.2)
+    diff-lcs (1.6.2)
+    domain_name (0.6.20240107)
+    dry-inflector (1.1.0)
+    excon (0.112.0)
+    facter (2.5.7)
+    fast_gettext (2.4.0)
+      prime
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.41.0)
+      fog-aliyun (>= 0.1.0)
+      fog-atmos
+      fog-aws (>= 0.6.0)
+      fog-brightbox (~> 0.4)
+      fog-cloudatcost (~> 0.1.0)
+      fog-core (~> 1.45)
+      fog-digitalocean (>= 0.3.0)
+      fog-dnsimple (~> 1.0)
+      fog-dynect (~> 0.0.2)
+      fog-ecloud (~> 0.1)
+      fog-google (<= 0.1.0)
+      fog-internet-archive
+      fog-joyent
+      fog-json
+      fog-local
+      fog-openstack
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      fog-rackspace
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-vsphere (>= 0.4.0)
+      fog-xenserver
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      json (>= 1.8, < 2.0)
+    fog-aliyun (0.3.13)
+      fog-core
+      fog-json
+      ipaddress (~> 0.8)
+      xml-simple (~> 1.1)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (2.0.1)
+      fog-core (~> 1.38)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.16.1)
+      dry-inflector
+      fog-core
+      fog-json
+      mime-types
+    fog-cloudatcost (0.1.2)
+      fog-core (~> 1.36)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-core (1.45.0)
+      builder
+      excon (~> 0.58)
+      formatador (~> 0.2)
+    fog-digitalocean (0.4.0)
+      fog-core
+      fog-json
+      fog-xml
+      ipaddress (>= 0.5)
+    fog-dnsimple (1.0.0)
+      fog-core (~> 1.38)
+      fog-json (~> 1.0)
+    fog-dynect (0.0.3)
+      fog-core
+      fog-json
+      fog-xml
+    fog-ecloud (0.3.0)
+      fog-core
+      fog-xml
+    fog-google (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-internet-archive (0.0.2)
+      fog-core
+      fog-json
+      fog-xml
+    fog-joyent (0.0.1)
+      fog-core (~> 1.42)
+      fog-json (>= 1.0)
+    fog-json (1.2.0)
+      fog-core
+      multi_json (~> 1.10)
+    fog-local (0.9.0)
+      fog-core (>= 1.27, < 3.0)
+    fog-openstack (0.3.10)
+      fog-core (>= 1.45, <= 2.1.0)
+      fog-json (>= 1.0)
+      ipaddress (>= 0.8)
+    fog-powerdns (0.2.1)
+      fog-core
+      fog-json
+      fog-xml
+    fog-profitbricks (4.1.1)
+      fog-core (~> 1.42)
+      fog-json (~> 1.0)
+    fog-rackspace (0.1.6)
+      fog-core (>= 1.35)
+      fog-json (>= 1.0)
+      fog-xml (>= 0.1)
+      ipaddress (>= 0.8)
+    fog-radosgw (0.0.5)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.7.5)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (1.1.4)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
+      fog-core
+      fog-json
+    fog-terremark (0.1.0)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.1.0)
+      fission
+      fog-core
+    fog-voxel (0.1.0)
+      fog-core
+      fog-xml
+    fog-vsphere (3.5.3)
+      fog-core
+      rbvmomi (>= 1.9, < 3)
+    fog-xenserver (1.0.0)
+      fog-core
+      fog-xml
+      xmlrpc
+    fog-xml (0.1.5)
+      fog-core
+      nokogiri (>= 1.5.11, < 2.0.0)
+    formatador (0.3.0)
+    forwardable (1.3.3)
+    hiera (3.12.0)
+    highline (2.1.0)
+    hocon (1.4.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.8)
+      domain_name (~> 0.5)
+    ipaddress (0.8.3)
     json (1.8.0)
-    json_pure (1.8.0)
     kwalify (0.7.2)
     librarian (0.1.0)
       highline
@@ -17,68 +180,118 @@ GEM
       json
       librarian (>= 0.1.0)
       thor (~> 0.15)
-    metaclass (0.0.1)
-    mime-types (1.23)
-    mocha (0.14.0)
-      metaclass (~> 0.0.1)
-    net-scp (1.1.2)
+    locale (2.1.4)
+    mime-types (1.25.1)
+    minitar (0.12.1)
+    mocha (2.7.1)
+      ruby2_keywords (>= 0.0.5)
+    multi_json (1.15.0)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
-    nokogiri (1.5.9)
-    puppet (3.2.1)
-      facter (~> 1.6)
-      hiera (~> 1.0)
-      rgen (~> 0.6)
-    puppet-blacksmith (1.0.5)
-      nokogiri
-      puppet (>= 2.7.16)
-      puppetlabs_spec_helper (>= 0.3.0)
-      rake
-      rest-client
+    net-ssh (2.9.4)
+    netrc (0.11.0)
+    nokogiri (1.5.11)
+    openvox (7.37.2)
+      concurrent-ruby (~> 1.0)
+      deep_merge (~> 1.0)
+      facter (> 2.0.1, < 5)
+      fast_gettext (>= 1.1, < 3)
+      hiera (>= 3.2.1, < 4)
+      locale (~> 2.1)
+      multi_json (~> 1.10)
+      puppet-resource_api (~> 1.5)
+      scanf (~> 1.0)
+      semantic_puppet (~> 1.0)
+    pathspec (1.1.3)
+    prime (0.1.4)
+      forwardable
+      singleton
+    puppet (7.34.0)
+      concurrent-ruby (~> 1.0)
+      deep_merge (~> 1.0)
+      facter (> 2.0.1, < 5)
+      fast_gettext (>= 1.1, < 3)
+      hiera (>= 3.2.1, < 4)
+      locale (~> 2.1)
+      multi_json (~> 1.10)
+      puppet-resource_api (~> 1.5)
+      scanf (~> 1.0)
+      semantic_puppet (~> 1.0)
+    puppet-blacksmith (8.2.0)
+      base64 (>= 0.2, < 0.4)
+      puppet-modulebuilder (~> 2.0, >= 2.0.2)
+      rest-client (~> 2.0)
     puppet-lint (0.3.2)
-    puppetlabs_spec_helper (0.4.1)
-      mocha (>= 0.10.5)
+    puppet-modulebuilder (2.0.2)
+      minitar (~> 0.9)
+      pathspec (>= 0.2.1, < 3.0.0)
+    puppet-resource_api (1.9.0)
+      hocon (>= 1.0)
+    puppet-syntax (6.0.0)
+      openvox (>= 7, < 9)
+      rake (~> 13.1)
+    puppetlabs_spec_helper (1.1.1)
+      mocha
+      puppet-lint
+      puppet-syntax
       rake
-      rspec (>= 2.9.0)
-      rspec-puppet (>= 0.1.1)
-    rake (10.0.4)
-    rbvmomi (1.6.0)
-      builder
-      nokogiri (>= 1.4.1)
-      trollop
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rgen (0.6.2)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+      rspec-puppet
+    rake (13.3.0)
+    rbvmomi (1.13.0)
+      builder (~> 3.0)
+      json (>= 1.8)
+      nokogiri (~> 1.5)
+      trollop (~> 2.1)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rexml (3.4.1)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rspec-puppet (0.1.6)
+    rspec-mocks (2.99.4)
+    rspec-puppet (3.0.0)
       rspec
-    rspec-system (2.2.0)
+    rspec-system (2.8.0)
+      fog (~> 1.18)
       kwalify (~> 0.7.2)
+      mime-types (~> 1.16)
       net-scp (~> 1.1)
-      net-ssh (~> 2.6)
-      nokogiri (~> 1.5.9)
+      net-ssh (~> 2.7)
+      nokogiri (~> 1.5.10)
       rbvmomi (~> 1.6)
-      rspec (~> 2.13)
+      rspec (~> 2.14)
       systemu (~> 2.5)
-    rspec-system-puppet (2.2.0)
+    rspec-system-puppet (2.2.1)
       rspec-system (~> 2.0)
-    rspec-system-serverspec (1.0.0)
+    rspec-system-serverspec (2.0.1)
       rspec-system (~> 2.0)
-      serverspec (~> 0.6.0)
-    serverspec (0.6.3)
+      serverspec (~> 0.0)
+      specinfra (~> 0.0)
+    ruby2_keywords (0.0.5)
+    scanf (1.0.0)
+    semantic_puppet (1.1.1)
+    serverspec (0.16.0)
       highline
       net-ssh
-      rspec (~> 2.0)
-    systemu (2.5.2)
+      rspec (~> 2.13)
+      specinfra (>= 0.7.1)
+    singleton (0.3.0)
+    specinfra (0.8.0)
+    systemu (2.6.5)
     thor (0.18.1)
-    trollop (2.0)
+    trollop (2.9.10)
+    webrick (1.9.1)
+    xml-simple (1.1.9)
+      rexml
+    xmlrpc (0.3.3)
+      webrick
 
 PLATFORMS
   ruby
@@ -86,11 +299,14 @@ PLATFORMS
 DEPENDENCIES
   librarian-puppet-maestrodev
   puppet (>= 3.0.1)
-  puppet-blacksmith
+  puppet-blacksmith (>= 3.0.0)
   puppet-lint (>= 0.1.12)
   puppetlabs_spec_helper
   rake (>= 0.9.2.2)
   rspec-puppet (>= 0.1.3)
-  rspec-system-puppet
-  rspec-system-serverspec
+  rspec-system-puppet (>= 2.2.1)
+  rspec-system-serverspec (>= 1.0.1)
   serverspec
+
+BUNDLED WITH
+   2.1.4