From f8e7c28decaf53d71cb5413ac329397fa56eeee7 Mon Sep 17 00:00:00 2001
From: Maru Newby <marun@redhat.com>
Date: Wed, 31 Jul 2013 03:29:44 +0000
Subject: [PATCH] Cleanup repo revision handling.

 * The use of the parameter 'version_to_test' is ambiguous, and
   implies that it is possible to specify an openstack release name
   like 'folsom' or 'grizzly'.  In fact, what is being specified
   is a git revision, branch, or tag.  The upstream branches are
   named 'stable/folsom' or 'stable/grizzly', and changing the name
   to 'tempest_repo_revision' should make it easier to deduce that
   such values are required.
 * Do not provide a default revision of 'master' - use the repo
   default instead.
 * Remove source tree cleanup for the 'folsom' branch.  There is
   no such branch upstream, it is 'stable/folsom', and besides,
   specifying the branch will provide a tempest tree compatible
   with the folsom release.

Change-Id: Iab117cffea22b50480bd88e3ea4d5eba55a69fe5
---
 manifests/init.pp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index eb68ec95..d79a3ee3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -9,13 +9,12 @@ class tempest(
   # Clone config
   #
   $tempest_repo_uri          = 'git://github.com/openstack/tempest.git',
+  $tempest_repo_revision     = undef,
   $tempest_clone_path        = '/var/lib/tempest',
   $tempest_clone_owner       = 'root',
 
   $setup_venv                = false,
 
-  $version_to_test           = 'master',
-
   # Glance image config
   #
   $configure_images          = true,
@@ -85,7 +84,7 @@ class tempest(
   vcsrepo { $tempest_clone_path:
     ensure   => 'present',
     source   => $tempest_repo_uri,
-    revision => $version_to_test,
+    revision => $tempest_repo_revision,
     provider => 'git',
     require  => Package['git'],
     user     => $tempest_clone_owner,
@@ -104,14 +103,6 @@ class tempest(
     }
   }
 
-  if $version_to_test == 'folsom' {
-    file { "${tempest_clone_path}/tempest/openstack":
-      purge   => true,
-      recurse => true,
-      require => Vcsrepo[$tempest_clone_path],
-    }
-  }
-
   $tempest_conf = "${tempest_clone_path}/etc/tempest.conf"
 
   file { $tempest_conf: