From 91051d4a4a8fe2208510a0a353db01b53255dc9c Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick@redhat.com>
Date: Mon, 15 Jun 2015 11:50:25 +0200
Subject: [PATCH] Update vcsrepo to 69c9fc6c5c794f829b9c68b546277ae0081c8329

69c9fc6c5c794f829b9c68b546277ae0081c8329 Merge pull request #253 from justinstoller/maint/master/set-puppet-version
a37c388f1b4c7b2d3db12fefe35261d067486f9f (maint) allow setting PUPPET_VERSION in acceptance

Change-Id: I860faa03ea8eed27426e56e1555766f74358487d
---
 Puppetfile                             | 2 +-
 vcsrepo/spec/spec_helper_acceptance.rb | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Puppetfile b/Puppetfile
index 51080c2e0..07ab8388f 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -219,7 +219,7 @@ mod 'tuskar',
   :git => 'https://github.com/stackforge/puppet-tuskar.git'
 
 mod 'vcsrepo',
-  :commit => '18b91b2f51a1cd8cd6911bd981e4629dd0d407e8',
+  :commit => '69c9fc6c5c794f829b9c68b546277ae0081c8329',
   :git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo.git'
 
 mod 'vlan',
diff --git a/vcsrepo/spec/spec_helper_acceptance.rb b/vcsrepo/spec/spec_helper_acceptance.rb
index 9ef826ae7..78074f742 100644
--- a/vcsrepo/spec/spec_helper_acceptance.rb
+++ b/vcsrepo/spec/spec_helper_acceptance.rb
@@ -3,7 +3,10 @@
 unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
   # This will install the latest available package on el and deb based
   # systems fail on windows and osx, and install via gem on other *nixes
-  foss_opts = { :default_action => 'gem_install' }
+  foss_opts = {
+    :default_action => 'gem_install',
+    :version        => (ENV['PUPPET_VERSION'] || '3.8.1'),
+  }
 
   if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end