4 files changed, 22 insertions, 35 deletions
diff --git a/docs/configguide/installation.rst b/docs/configguide/installation.rst
index 2f3faaeb..7ba64bba 100755
--- a/docs/configguide/installation.rst
+++ b/docs/configguide/installation.rst
@@ -13,7 +13,7 @@ Supported Operating Systems
 * Fedora 20
 * Fedora 21
 * Fedora 22
-* RedHat 7.2
+* RedHat 7.2 Enterprise
 * Ubuntu 14.04
 
 Supported vSwitches
@@ -99,8 +99,8 @@ reside in a directory called **vsperfenv** in $HOME.
 You will need to activate the virtual environment every time you start a
 new shell session. Its activation is specific to your OS:
 
-CentOS 7
-========
+CentOS 7 and RedHat
+===================
 
 .. code:: bash
 
@@ -108,8 +108,8 @@ CentOS 7
     $ cd $HOME/vsperfenv
     $ source bin/activate
 
-Fedora, RedHat and Ubuntu
-=========================
+Fedora and Ubuntu
+=================
 
 .. code:: bash
 
diff --git a/fuel-plugin-vsperf/metadata.yaml b/fuel-plugin-vsperf/metadata.yaml
index 2b28fc58..cf64e292 100644
--- a/fuel-plugin-vsperf/metadata.yaml
+++ b/fuel-plugin-vsperf/metadata.yaml
@@ -3,11 +3,11 @@ name: fuel-plugin-vsperf
 # Human-readable name for your plugin
 title: Enable VSPERF plugin
 # Plugin version
-version: '1.0.9'
+version: '1.0.10'
 # Description
 description: Deploy VSPERF code
 # Required fuel version
-fuel_version: ['9.0']
+fuel_version: ['10.0']
 # Specify license of your plugin
 licenses: ['Apache License Version 2.0']
 # Specify author or company name
@@ -21,7 +21,7 @@ groups: ['network']
 # The plugin is compatible with releases in the list
 releases:
   - os: ubuntu
-    version: mitaka-9.0
+    version: newton-10.0
     mode: ['ha']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/ubuntu
diff --git a/systems/rhel/7.2/build_base_machine.sh b/systems/rhel/7.2/build_base_machine.sh
index 2319535b..d57cf9c0 100755
--- a/systems/rhel/7.2/build_base_machine.sh
+++ b/systems/rhel/7.2/build_base_machine.sh
@@ -78,23 +78,15 @@ if [ "${#failedinstall[*]}" -gt 0 ]; then
     exit 1
 fi
 
-# python34 is not yet available to Red Hat customers so we will just build
-# it as an alternate install in usr/local for use with VSPerf. This prevents
-# any functionality issues with pre-installed packages using python.
-wget https://www.python.org/ftp/python/3.4.2/Python-3.4.2.tar.xz
-tar -xf Python-3.4.2.tar.xz
-cd Python-3.4.2
-./configure
-make
-make altinstall
-cd ..
+# install SCL for python33
+wget https://www.softwarecollections.org/en/scls/rhscl/python33/epel-7-x86_64/download/rhscl-python33-epel-7-x86_64.noarch.rpm
+rpm -i rhscl-python33-epel-7-x86_64.noarch.rpm
 
-# cleanup
-rm -Rf Python-3.4.2
-rm -f Python-3.4.2.tar.xz
-
-# need virtualenv
-pip3.4 install virtualenv
+# install python33 packages and git-review tool
+yum -y install $(echo "
+python33
+python33-python-tkinter
+" | grep -v ^#)
 
 # Create hugepage dirs
 mkdir -p /dev/hugepages
diff --git a/systems/rhel/7.2/prepare_python_env.sh b/systems/rhel/7.2/prepare_python_env.sh
index 1d51380a..bd468d80 100755
--- a/systems/rhel/7.2/prepare_python_env.sh
+++ b/systems/rhel/7.2/prepare_python_env.sh
@@ -17,18 +17,13 @@
 # limitations under the License.
 
 if [ -d "$VSPERFENV_DIR" ] ; then
-    echo "Directory $VSPERFENV_DIR already exists. Skipping python virtualenv \
-creation."
+    echo "Directory $VSPERFENV_DIR already exists. Skipping python virtualenv creation."
     exit
 fi
 
-# enable virtual environment in a subshell, so QEMU build can use python 2.7
-# Also make sure we know which virtualenv was installed. I've seen the file
-# name change pending on what type of installation was done.
-virtualenv_file=$(ls /usr/local/bin | awk '/virtualenv/')
-
-($virtualenv_file "$VSPERFENV_DIR"
+scl enable python33 "
+virtualenv "$VSPERFENV_DIR"
 source "$VSPERFENV_DIR"/bin/activate
-pip3.4 install -r ../requirements.txt
-pip3.4 install pylint
-)
-\ No newline at end of file
+pip install -r ../requirements.txt
+pip install pylint
+"
+\ No newline at end of file