From a90fab1193eee4ef007026f5997f25d31a552131 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Fri, 23 Dec 2011 15:02:57 -0800
Subject: [PATCH] Rename .quantum-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: I93c7f6577b4c3a76b021f002bda59fcb8fac3f95
---
 .bzrignore               | 1 +
 .gitignore               | 1 +
 quantum/README           | 2 +-
 quantum/common/config.py | 2 +-
 run_tests.sh             | 2 +-
 tools/install_venv.py    | 4 ++--
 tools/with_venv.sh       | 2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index dcc06ced189..fa741971c2d 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -3,6 +3,7 @@ quantum.egg-info
 quantum_tests.sqlite
 quantum.sqlite
 *.quantum-venv
+.venv
 dist/
 ChangeLog
 *.pid
diff --git a/.gitignore b/.gitignore
index a750e7a9673..e0eeb594170 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ run_tests.err.log
 run_tests.log
 tests/
 .quantum-venv/
+.venv/
diff --git a/quantum/README b/quantum/README
index 51b0f1efbde..cecb5f48401 100644
--- a/quantum/README
+++ b/quantum/README
@@ -70,7 +70,7 @@ this)
        # Install into $HOME/.local/...
 
     c) python setup.py install --venv
-       # Creates and installs into a virtual-env at ~/.quantum-venv
+       # Creates and installs into a virtual-env at ~/.venv
 
 # -- Configuring Quantum plug-in
 
diff --git a/quantum/common/config.py b/quantum/common/config.py
index 3788b5c1f4a..eece4432753 100644
--- a/quantum/common/config.py
+++ b/quantum/common/config.py
@@ -208,7 +208,7 @@ def find_config_file(options, args, config_file='quantum.conf'):
     root = os.path.join(dir_to_common, '..', '..', '..', '..')
     # Handle standard directory search for the config file
     config_file_dirs = [fix_path(os.path.join(os.getcwd(), 'etc')),
-                        fix_path(os.path.join('~', '.quantum-venv', 'etc',
+                        fix_path(os.path.join('~', '.venv', 'etc',
                                  'quantum')),
                         fix_path('~'),
                         os.path.join(FLAGS.state_path, 'etc'),
diff --git a/run_tests.sh b/run_tests.sh
index ddd59a7cec5..0a0a593f5f9 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -34,7 +34,7 @@ function process_option {
   esac
 }
 
-venv=.quantum-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 b9a34c8741e..48eecbdd1e6 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -29,7 +29,7 @@ import sys
 
 
 ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-VENV = os.path.join(ROOT, '.quantum-venv')
+VENV = os.path.join(ROOT, '.venv')
 PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')
 PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
 
@@ -110,7 +110,7 @@ def print_help():
  To activate the Quantum virtualenv for the extent of your current shell
  session you can run:
 
- $ source .quantum-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 83149462c1a..93eaa889f02 100755
--- a/tools/with_venv.sh
+++ b/tools/with_venv.sh
@@ -17,5 +17,5 @@
 #    under the License.
 
 TOOLS=`dirname $0`
-VENV=$TOOLS/../.quantum-venv
+VENV=$TOOLS/../.venv
 source $VENV/bin/activate && $@