summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAdrian Smith <adrian_f_smith@dell.com>2011-11-28 21:24:47 +0000
committerAdrian Smith <adrian_f_smith@dell.com>2011-12-06 19:45:21 +0000
commitdbbd6cf1079ef46de3e9ec11db0eb824a3875099 (patch)
tree6fb5b81a1a6c2432985fa56b7027cfc4e0812947 /tools
parent882b1e475de1ef71d7d3f0b50a58f91569905a75 (diff)
downloadnova-dbbd6cf1079ef46de3e9ec11db0eb824a3875099.tar.gz
nova-dbbd6cf1079ef46de3e9ec11db0eb824a3875099.tar.xz
nova-dbbd6cf1079ef46de3e9ec11db0eb824a3875099.zip
Use system M2Crypto package on Oneiric, bug 892271
Ubuntu Oneiric has a problem with the pip installed version of m2crypto. This fix installs python-m2crypto via apt-get on Oneiric. Change-Id: I8290a74b614eb0d0b8d620dbad19d2cc6843de8b
Diffstat (limited to 'tools')
-rw-r--r--tools/install_venv.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py
index f1d2ea86c..e5279a840 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -27,6 +27,7 @@ import optparse
import os
import subprocess
import sys
+import platform
ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
@@ -98,6 +99,17 @@ class Distro(object):
pass
+class UbuntuOneiric(Distro):
+ """Oneiric specific installation steps"""
+
+ def install_m2crypto(self):
+ """
+ The pip installed version of m2crypto has problems on oneiric
+ """
+ run_command(['sudo', 'apt-get', 'install', '-y',
+ "python-m2crypto"])
+
+
class Fedora(Distro):
"""This covers all Fedora-based distributions.
@@ -155,6 +167,8 @@ def get_distro():
if os.path.exists('/etc/fedora-release') or \
os.path.exists('/etc/redhat-release'):
return Fedora()
+ elif platform.linux_distribution()[2] == 'oneiric':
+ return UbuntuOneiric()
else:
return Distro()