From 37fc2b00c0a8dd67221d83697609913aa78d89c7 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Mon, 5 Dec 2011 11:23:40 -0800
Subject: [PATCH] Rename .glance-venv to .venv.

This simplifies a number of Jenkins jobs which currently, other
than directory names, could be the same for all OpenStack
projects.  By renaming the virtualenv directory, the redundant
Jenkins virtualenv build and copy jobs can be eliminated.

Change-Id: I7916783d863e5184bad8293c3aed5ba119e374a9
---
 .bzrignore            | 1 +
 .gitignore            | 1 +
 .mailmap              | 3 ++-
 Authors               | 2 +-
 run_tests.sh          | 2 +-
 tools/install_venv.py | 4 ++--
 tools/with_venv.sh    | 2 +-
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index 0dc1ca0dbf..3c39f0b097 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -2,6 +2,7 @@
 glance.egg-info
 tests.sqlite
 *.glance-venv
+.venv/
 dist/
 ChangeLog
 *.pid
diff --git a/.gitignore b/.gitignore
index 44f40dcd8e..52b5f3df09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.swp
 *.log
 .glance-venv
+.venv
 build
 dist
 glance.egg-info
diff --git a/.mailmap b/.mailmap
index f4b460681a..8467e9bf6f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,4 +9,5 @@
 <rick@openstack.org> <rclark@chat-blanc>
 <soren.hansen@rackspace.com> <soren@linux2go.dk>
 <soren.hansen@rackspace.com> <soren@openstack.org>
-<james.blair@rackspace.com> <corvus@gnu.org>
+<jeblair@hp.com> <corvus@gnu.org>
+<jeblair@hp.com> <james.blair@rackspace.com>
diff --git a/Authors b/Authors
index 2332b73dc8..4ea64dd367 100644
--- a/Authors
+++ b/Authors
@@ -12,7 +12,7 @@ Ewan Mellor <ewan.mellor@citrix.com>
 Isaku Yamahata <yamahata@valinux.co.jp>
 Jason Koelker <jason@koelker.net>
 Jay Pipes <jaypipes@gmail.com>
-James E. Blair <james.blair@rackspace.com>
+James E. Blair <jeblair@hp.com>
 Jinwoo 'Joseph' Suh <jsuh@isi.edu>
 Johannes Erdfelt <johannes.erdfelt@rackspace.com>
 Josh Durgin <josh.durgin@dreamhost.com>
diff --git a/run_tests.sh b/run_tests.sh
index 8fb78944dd..a8c3569aea 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -29,7 +29,7 @@ function process_option {
   esac
 }
 
-venv=.glance-venv
+venv=.venv
 with_venv=tools/with_venv.sh
 always_venv=0
 never_venv=0
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 5c0f71a439..7a9473a63a 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -28,7 +28,7 @@ import sys
 
 
 ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-VENV = os.path.join(ROOT, '.glance-venv')
+VENV = os.path.join(ROOT, '.venv')
 PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')
 
 
@@ -124,7 +124,7 @@ def print_help():
  To activate the Glance virtualenv for the extent of your current shell session
  you can run:
 
- $ source .glance-venv/bin/activate
+ $ source .venv/bin/activate
 
  Or, if you prefer, you can run commands in the virtualenv on a case by case
  basis by running:
diff --git a/tools/with_venv.sh b/tools/with_venv.sh
index fc5ed773e2..c8d2940fc7 100755
--- a/tools/with_venv.sh
+++ b/tools/with_venv.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 TOOLS=`dirname $0`
-VENV=$TOOLS/../.glance-venv
+VENV=$TOOLS/../.venv
 source $VENV/bin/activate && $@