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

diff --git a/.bzrignore b/.bzrignore
index dcc06ced189fe74af9339e23c1f44a464b589892..fa741971c2dd75e7ee0d2a897df5c114d08d8902 100644 (file)
--- 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 a750e7a96737273e8c842119f5424e0d6a0d532a..e0eeb594170f13c7b72bd609816730b8c29c7d97 100644 (file)
--- 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 51b0f1efbde61ff1380125236f01a3b74f076642..cecb5f48401d929815278223f1b592459d03f7c1 100644 (file)
--- 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 3788b5c1f4a8501e30171ea774aa0e0888dc637c..eece4432753572f4c14ea91c70c3eff723901c24 100644 (file)
--- 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 ddd59a7cec544f6e6bb227b62fc8f1c7b63044e0..0a0a593f5f98dd0fa664e4b6f672efb957db80d0 100755 (executable)
--- 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 b9a34c8741ed5eec486bad8c56997c802f79a57c..48eecbdd1e6269769a5882439db2e46772e33128 100644 (file)
--- 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 83149462c1aa06520a7ea6ea4e49c48bee2a231b..93eaa889f022eac55dde198fac2bbccb55fa5b02 100755 (executable)
--- 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 && $@