Merge remote-tracking branch 'upstream/stable'

* upstream/stable:
  (FACT-1293) Add Arista Support
  (FACT-1281) Remove per-repo node configs for pooler vms
  (FACT-1281) Remove temp workaround

acceptance/Rakefile

@@ -107,11 +107,7 @@ def beaker_test(mode = :aio, options = {})
   tests = ENV['TESTS'] || ENV['TEST']
   tests_opt = "--tests=#{tests}" if tests
 
-  # The 'if ...' suffix conditional below is a temporary measure which should go
-  # away once the pipeline changes are made so that TEST_TARGET is always
-  # intended for use with beaker-hostgenerator. So please remove that
-  # conditional (and this comment) once that pipeline change is made.
-  target = ENV['TEST_TARGET'] if ENV['TEST_TARGET'] && ENV['TEST_TARGET'][-1,1] == 'a'
+  target = ENV['TEST_TARGET']
   if target
     cli = BeakerHostGenerator::CLI.new([target, '--disable-default-role', '--osinfo-version', '1'])
     ENV['HOSTS'] = "tmp/#{target}-#{SecureRandom.uuid}.yaml"

acceptance/config/aio/options.rb

@@ -7,5 +7,6 @@
   :pre_suite     => [
     'setup/common/pre-suite/000-delete-puppet-when-none.rb',
     'setup/aio/pre-suite/010_Install.rb',
+    'setup/aio/pre-suite/021_InstallAristaModule.rb',
   ],
 }