Merge pull request #9019 from justinstoller/full_catalog

(maint) Update the full_catalog benchmark for strict_variables support

Author: joshcooper

benchmarks/full_catalog/benchmarker.rb

@@ -60,13 +60,16 @@ def run(args=nil)
       },
       'memorysize' => '8 GiB',
       'osfamily' => 'RedHat',
+      'selinux' => false,
       'operatingsystem' => 'CentOS',
       'operatingsystemrelease' => '6.8',
+      'path' => '/tmp/staging/',
       'processorcount' => '2',
       'fake_domain' => 'pgtomcat.mycompany.org',
       'function' => 'app',
       'group' => 'pgtomcat',
       'stage' => 'prod',
+      'staging_http_get' => 'curl',
       'whereami' => 'portland',
       'hostname' => 'pgtomcat',
       'fqdn' => 'pgtomcat.mycompany.org',

benchmarks/full_catalog/hiera.yaml.erb

@@ -5,7 +5,6 @@
   :datadir: "<%= datadir %>"
 :hierarchy:
 # This hierarchy is based on the one from the puppetlabs ops team.
-  - "vagrant/%{is_vagrant}"
   - "nodes/%{fake_domain}/%{fqdn}"
   - "nodes/%{fake_domain}/%{hostname}"
   - "domains/%{fake_domain}/groups/%{group}"